diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp
index 860ce043f..b7eb36bd2 100644
--- a/retroshare-gui/src/gui/notifyqt.cpp
+++ b/retroshare-gui/src/gui/notifyqt.cpp
@@ -536,13 +536,13 @@ void NotifyQt::notifyListChange(int list, int type)
 #endif
 	switch(list)
 	{
-		case NOTIFY_LIST_NEIGHBOURS:
+#ifdef TO_REMOVE
+        case NOTIFY_LIST_NEIGHBOURS:
 #ifdef NOTIFY_DEBUG
 			std::cerr << "received neighbours changed" << std::endl ;
 #endif
 			emit neighboursChanged();
 			break;
-#ifdef TO_REMOVE
 		case NOTIFY_LIST_FRIENDS:
 #ifdef NOTIFY_DEBUG
 			std::cerr << "received friends changed" << std::endl ;
@@ -634,6 +634,7 @@ void NotifyQt::notifyListChange(int list, int type)
 	return;
 }
 
+#ifdef TO_REMOVE
 void NotifyQt::notifyListPreChange(int list, int /*type*/)
 {
 	{
@@ -649,7 +650,6 @@ void NotifyQt::notifyListPreChange(int list, int /*type*/)
 	{
 		case NOTIFY_LIST_NEIGHBOURS:
 			break;
-#ifdef TO_REMOVE
 		case NOTIFY_LIST_FRIENDS:
 			emit friendsChanged() ;
 			break;
@@ -659,7 +659,6 @@ void NotifyQt::notifyListPreChange(int list, int /*type*/)
 		case NOTIFY_LIST_DIRLIST_LOCAL:
 			emit filesPreModChanged(true) ;	/* local */
 			break;
-#endif
         case NOTIFY_LIST_SEARCHLIST:
 			break;
 		case NOTIFY_LIST_CHANNELLIST:
@@ -671,6 +670,7 @@ void NotifyQt::notifyListPreChange(int list, int /*type*/)
 	}
 	return;
 }
+#endif
 
 void NotifyQt::enable()
 {
@@ -694,7 +694,7 @@ void NotifyQt::UpdateGUI()
 														// the gui is running, then they get updated by callbacks.
 	if(!already_updated)
 	{
-		emit neighboursChanged();
+//		emit neighboursChanged();
 		emit configChanged();
 
 		already_updated = true ;
diff --git a/retroshare-gui/src/gui/notifyqt.h b/retroshare-gui/src/gui/notifyqt.h
index 7be023772..8adfd9fd7 100644
--- a/retroshare-gui/src/gui/notifyqt.h
+++ b/retroshare-gui/src/gui/notifyqt.h
@@ -60,7 +60,7 @@ class NotifyQt: public QObject, public NotifyClient
 
 		void setNetworkDialog(NetworkDialog *c) { cDialog = c; }
 
-		virtual void notifyListPreChange(int list, int type);
+//		virtual void notifyListPreChange(int list, int type);
 		virtual void notifyListChange(int list, int type);
 //		virtual void notifyErrorMsg(int list, int sev, std::string msg);
 		virtual void notifyChatMessage(const ChatMessage&        /* msg */);
@@ -104,14 +104,14 @@ class NotifyQt: public QObject, public NotifyClient
 		// It's beneficial to send info to the GUI using signals, because signals are thread-safe
 		// as they get queued by Qt.
 		//
-		void hashingInfoChanged(const QString&) const ;
+//		void hashingInfoChanged(const QString&) const ;
 //		void filesPreModChanged(bool) const ;
-		void filesPostModChanged(bool) const ;
+//		void filesPostModChanged(bool) const ;
 //		void transfersChanged() const ;
 //		void friendsChanged() const ;
 		void lobbyListChanged() const ;
         void chatLobbyEvent(qulonglong,int,const RsGxsId&,const QString&) ;
-		void neighboursChanged() const ;
+//		void neighboursChanged() const ;
 		void configChanged() const ;
 		void logInfoChanged(const QString&) const ;
 		void chatStatusChanged(const ChatId&,const QString&) const ;
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index ad37fb54c..dffe7e133 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -731,7 +731,7 @@ feenableexcept(FE_INVALID | FE_DIVBYZERO);
 //    QObject::connect(notify,SIGNAL(filesPostModChanged(bool))         ,w                         ,SLOT(postModDirectories(bool)) ,Qt::QueuedConnection        ) ;
 //    QObject::connect(notify,SIGNAL(transfersChanged())                ,w->transfersDialog  		,SLOT(insertTransfers()                )) ;
     QObject::connect(notify,SIGNAL(publicChatChanged(int))            ,w->friendsDialog      		,SLOT(publicChatChanged(int)           ));
-    QObject::connect(notify,SIGNAL(neighboursChanged())               ,w->friendsDialog->networkDialog    		,SLOT(securedUpdateDisplay())) ;
+//    QObject::connect(notify,SIGNAL(neighboursChanged())               ,w->friendsDialog->networkDialog    		,SLOT(securedUpdateDisplay())) ;
 
     QObject::connect(notify,SIGNAL(chatStatusChanged(const QString&,const QString&,bool)),w->friendsDialog,SLOT(updatePeerStatusString(const QString&,const QString&,bool)));
     QObject::connect(notify,SIGNAL(ownStatusMessageChanged()),w->friendsDialog,SLOT(loadmypersonalstatus()));