2 files changed, 4 insertions, 6 deletions
diff --git a/src/ui/mapper/FontMapper.cpp b/src/ui/mapper/FontMapper.cpp
index a0dcdd9f..ebf7c27c 100644
--- a/src/ui/mapper/FontMapper.cpp
+++ b/src/ui/mapper/FontMapper.cpp
@@ -1,6 +1,5 @@
 #include "cru/ui/mapper/FontMapper.h"
 #include "../Helper.h"
-#include "cru/base/String.h"
 #include "cru/base/StringUtil.h"
 #include "cru/platform/graphics/Factory.h"
 
diff --git a/src/ui/mapper/StringMapper.cpp b/src/ui/mapper/StringMapper.cpp
index 5914da17..6f6b4546 100644
--- a/src/ui/mapper/StringMapper.cpp
+++ b/src/ui/mapper/StringMapper.cpp
@@ -1,19 +1,18 @@
 #include "cru/ui/mapper/StringMapper.h"
 #include "cru/xml/XmlNode.h"
-#include "cru/base/String.h"
 
 namespace cru::ui::mapper {
 StringMapper::StringMapper() { SetAllowedTags({"String"}); }
 
 StringMapper::~StringMapper() {}
 
-String StringMapper::DoMapFromString(std::string str) {
-  return String::FromUtf8(str);
+std::string StringMapper::DoMapFromString(std::string str) {
+  return std::move(str);
 }
 
-String StringMapper::DoMapFromXml(xml::XmlElementNode* node) {
+std::string StringMapper::DoMapFromXml(xml::XmlElementNode* node) {
   auto value_attr = node->GetOptionalAttributeValueCaseInsensitive("value");
-  if (value_attr) return String::FromUtf8(*value_attr);
+  if (value_attr) return *value_attr;
   return {};
 }
 }  // namespace cru::ui::mapper