Index: source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- source/ariba/overlay/modules/chord/Chord.cpp	(revision 5673)
+++ source/ariba/overlay/modules/chord/Chord.cpp	(revision 5674)
@@ -74,10 +74,4 @@
 	logging_debug("Request to setup link to " << endp.toString() );
 
-	// check if node is already present
-	if (!node.isUnspecified() && table->get(node)!=NULL) {
-		logging_error("Node is already a neighbor!");
-		return LinkID::UNSPECIFIED;
-	}
-
 	// check if we are already trying to establish a link
 	for (size_t i=0; i<pending.size(); i++)
@@ -218,6 +212,6 @@
 		// all nodes that I know, fingers, succ/pred
 		for (size_t i = 0; i < table->size(); i++){
-			if (/*(*table)[i]->ref_count != 0
-					&&*/ !(*table)[i]->info.isUnspecified())
+			if ((*table)[i]->ref_count != 0
+					&& !(*table)[i]->info.isUnspecified())
 				nodelist.push_back((*table)[i]->id);
 		}
@@ -459,5 +453,4 @@
 		}
 
-
 		// remove orphan links
 		orphan_removal_counter++;
@@ -469,6 +462,6 @@
 				if (it->ref_count == 0 && !it->info.isUnspecified()) {
 					logging_info("Dropping orphaned link " << it->info.toString() << " to " << it->id.toString());
-//					baseoverlay.dropLink(it->info);
-//					it->info = LinkID::UNSPECIFIED;
+					baseoverlay.dropLink(it->info);
+					it->info = LinkID::UNSPECIFIED;
 				}
 			}