Index: /trunk/FACT++/src/DimServiceInfoList.cc
===================================================================
--- /trunk/FACT++/src/DimServiceInfoList.cc	(revision 11266)
+++ /trunk/FACT++/src/DimServiceInfoList.cc	(revision 11267)
@@ -128,4 +128,6 @@
     }
 
+    RemoveAllServices(s);
+
     // Remove the server from the server list
     delete v->second[0];
@@ -148,12 +150,5 @@
     for (ServiceInfoList::iterator i=fServiceInfoList.begin();
          i!=fServiceInfoList.end(); i++)
-    {
-        delete i->second[0];
-        delete i->second[1];
-        delete i->second[2];
-    }
-
-    fServiceInfoList.clear();
-    fServiceList.clear();
+        RemoveServer(i->first);
 }