diff --git a/libretroshare/src/turtle/p3turtle.cc b/libretroshare/src/turtle/p3turtle.cc
index c94978823..9fe58915b 100644
--- a/libretroshare/src/turtle/p3turtle.cc
+++ b/libretroshare/src/turtle/p3turtle.cc
@@ -1447,7 +1447,7 @@ void p3turtle::handleTunnelRequest(RsTurtleOpenTunnelItem *item)
 	// We're off-mutex here.
 
 	bool found = false ;
-	std::string info ;
+	//std::string info ;
 	RsTurtleClientService *service = NULL ;
 
 	if(item->PeerId() != _own_id)
@@ -1872,13 +1872,12 @@ void p3turtle::monitorTunnels(const RsFileHash& hash,RsTurtleClientService *clie
 
 		// First, check if the hash is tagged for removal (there's a delay)
 
-        if(_hashes_to_remove.find(hash) != _hashes_to_remove.end())
-        {
-            _hashes_to_remove.erase(hash) ;
+		if(_hashes_to_remove.erase(hash) > 0)
+		{
 #ifdef P3TURTLE_DEBUG
-            std::cerr << "p3turtle: File hash " << hash << " Was scheduled for removal. Canceling the removal." << std::endl ;
+			std::cerr << "p3turtle: File hash " << hash << " Was scheduled for removal. Canceling the removal." << std::endl ;
 #endif
-        }
+		}
 
 		// Then, check if the hash is already there
 		//