diff --git a/source/RobotAPI/libraries/armem/core/base/detail/MemoryContainerBase.h b/source/RobotAPI/libraries/armem/core/base/detail/MemoryContainerBase.h
index 0fec334ca46c5285a1f5823547c65fbcdeb859b9..210211089ea75ebd0b7da16556dc7e98553793aa 100644
--- a/source/RobotAPI/libraries/armem/core/base/detail/MemoryContainerBase.h
+++ b/source/RobotAPI/libraries/armem/core/base/detail/MemoryContainerBase.h
@@ -48,10 +48,6 @@ namespace armarx::armem::base::detail
         {
             return _container.size();
         }
-        bool hasData() const
-        {
-            return size() > 0;
-        }
         void clear()
         {
             return _container.clear();
diff --git a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
index 354eec9cea9d1d1e37f4dc4ea790b47ba1749755..13aea87b259d2b2905ce330e22a2e09d92abb7b7 100644
--- a/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
+++ b/source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
@@ -242,7 +242,7 @@ namespace armarx::armem::server
         ltm::Memory ltmResult = ltmProcessor.process(input, *longtermMemory);
 
         armem::query::data::Result result;
-        if (ltmResult.hasData())
+        if (not ltmResult.empty())
         {
             ARMARX_INFO << "The LTM returned data after query";
 
@@ -252,13 +252,13 @@ namespace armarx::armem::server
             // However, this is expected behavior, since we copy the data in the processor (copyEmpty) we can safely return the copy and
             // remove the original memory reference from WM here.
             wm::Memory ltmConverted = ltmResult.convert();
-            if (!ltmConverted.hasData())
+            if (ltmConverted.empty())
             {
                 ARMARX_ERROR << "A converted memory contains no data although the original memory contained data. This indicates that something is wrong.";
             }
 
             wmResult.append(ltmConverted);
-            if (!wmResult.hasData())
+            if (wmResult.empty())
             {
                 ARMARX_ERROR << "A merged Memory has no data although at least the LTM result contains data. This indicates that something is wrong.";
             }
@@ -268,7 +268,7 @@ namespace armarx::armem::server
             queryInput.replaceQueryTarget(query::data::QueryTarget::LTM, query::data::QueryTarget::WM);
 
             wm::Memory merged_result = wmProcessor.process(queryInput.toIce(), wmResult);
-            if (!merged_result.hasData())
+            if (merged_result.empty())
             {
                 ARMARX_ERROR << "A merged and postprocessed Memory has no data although at least the LTM result contains data. This indicates that something is wrong.";
             }
diff --git a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
index f88a2e1731c87de6fa163c307c90f4c6d3e01ae2..76272adcfa755be0530c14056a5565c17b0c7032 100644
--- a/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
+++ b/source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
@@ -267,9 +267,9 @@ namespace armarx::armem::gui
                 armem::client::QueryResult result = reader.query(input);
                 if (result)
                 {
-                    if (result.memory.hasData())
+                    if (not result.memory.empty())
                     {
-                        if (const auto& it = memoryData.find(name); it != memoryData.end())
+                        if (auto it = memoryData.find(name); it != memoryData.end())
                         {
                             result.memory.append(it->second);
 
@@ -277,7 +277,7 @@ namespace armarx::armem::gui
                             armem::wm::query_proc::MemoryQueryProcessor wm_processor;
                             result.memory = wm_processor.process(input.toIce(), result.memory);
 
-                            if (!result.memory.hasData())
+                            if (result.memory.empty())
                             {
                                 ARMARX_ERROR << "A memory which had data before lost data. This indicates that there is something wrong.";
                             }