diff --git a/nlsr.c b/nlsr.c
index 0fa0084..088df30 100644
--- a/nlsr.c
+++ b/nlsr.c
@@ -157,12 +157,7 @@
 	}
 
 	struct ndn_neighbor *nbr=(struct ndn_neighbor *)malloc(sizeof(struct ndn_neighbor*));
-	//nbr->neighbor=(struct name_prefix *)malloc(sizeof(struct name_prefix *));
-	//nbr->neighbor->name=(char *)malloc(strlen(rtr_name)+1);
-	//memcpy(nbr->neighbor->name,rtr_name,strlen(rtr_name)+1);
-	//nbr->neighbor->length=strlen(rtr_name);
 	nbr->neighbor=ccn_charbuf_create();
-	//ccn_name_from_uri(nbr->neighbor,rtr_name);
 	ccn_charbuf_append_string(nbr->neighbor,rtr_name);
 	nbr->face=face_id;
 	nbr->status=0;	
@@ -315,6 +310,7 @@
 	{
 		nbr=e->data;
 		hashtb_destroy(&nbr->lsa_update_queue);	
+		ccn_charbuf_destroy(&nbr->neighbor);
 		hashtb_next(e);		
 	}
 	hashtb_end(e);
diff --git a/nlsr_adl.c b/nlsr_adl.c
index c55efe4..f4237fb 100644
--- a/nlsr_adl.c
+++ b/nlsr_adl.c
@@ -42,20 +42,10 @@
    
 		hnbr = e->data;
 		hnbr->neighbor=ccn_charbuf_create();
-		//res=ccn_name_from_uri(hnbr->neighbor,ccn_charbuf_as_string(nbr->neighbor));
 		ccn_charbuf_append_string(hnbr->neighbor,ccn_charbuf_as_string(nbr->neighbor));
-		
-		//hnbr->neighbor=(struct name_prefix *)malloc(sizeof(struct name_prefix *));
-		//hnbr->neighbor->name=(char *)malloc(nbr->neighbor->length);
-		//memcpy(hnbr->neighbor->name,nbr->neighbor->name,nbr->neighbor->length);
-		//hnbr->neighbor->name[nbr->neighbor->length]='\0';
-		//hnbr->last_lsdb_version=(char *)malloc(15);
-		//hnbr->neighbor->length=nbr->neighbor->length;
 
 		hnbr->face=nbr->face;
 		hnbr->status=nbr->status;
-		//memcpy(hnbr->last_lsdb_version,"00000000000000",14);
-		//memcpy(hnbr->last_lsdb_version+strlen(hnbr->last_lsdb_version),"\0",1);
 		hnbr->last_lsdb_version=0;
 
 		struct hashtb_param param_luq = {0};