2 files changed, 2 insertions, 13 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index b2d03402d58..47815ac3157 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -363,7 +363,7 @@ Ice::ObjectAdapterI::removeAllFacets(const Identity& ident)
     checkForDeactivation();
     checkIdentity(ident);
 
-    FacetMap fm = _servantManager->removeAllFacets(ident);
+    return _servantManager->removeAllFacets(ident);
 }
 
 ObjectPtr
diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp
index 971c20cf046..42c16b9fbb3 100644
--- a/cpp/src/Ice/ServantManager.cpp
+++ b/cpp/src/Ice/ServantManager.cpp
@@ -130,13 +130,7 @@ IceInternal::ServantManager::removeAllFacets(const Identity& ident)
 	throw ex;
     }
 
-    cerr << "p->second.size() = " << p->second.size() << endl;
-    //FacetMap result = p->second;
-    FacetMap result;
-    for(FacetMap::const_iterator i = p->second.begin(); i != p->second.end(); ++i)
-    {
-	result.insert(*i);
-    }
+    FacetMap result = p->second;
 
     if(p == _servantMapMapHint)
     {
@@ -147,11 +141,6 @@ IceInternal::ServantManager::removeAllFacets(const Identity& ident)
     {
 	_servantMapMap.erase(p);
     }
-    cerr << "result.size() = " << result.size() << endl;
-    for(FacetMap::const_iterator i = result.begin(); i != result.end(); ++i)
-    {
-	cerr << i->first << endl;
-    }
 
     return result;
 }