diff --git a/manager.cpp b/manager.cpp
index 276a5a5..94b4af1 100644
--- a/manager.cpp
+++ b/manager.cpp
@@ -70,6 +70,11 @@
 #endif
 }
 
+void Manager::erase(EntryID id)
+{
+    entries.erase(id);
+}
+
 void Manager::addInterface(const std::string& objectPath, InterfaceType type,
                            std::experimental::any& object)
 {
@@ -140,13 +145,7 @@
 
     if (i != interfaces.end())
     {
-        auto id = getEntryID(path);
-
-        auto entry = entries.find(id);
-        if (entry != entries.end())
-        {
-            entries.erase(entry);
-        }
+        erase(getEntryID(path));
     }
 }
 }