diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index a21b1f202..7513e9670 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -614,8 +614,8 @@ SOURCES +=	zeroconf/p3zcnatassist.cc \
 gxs {
 	DEFINES *= RS_ENABLE_GXS
 
-	#DEFINES *= GXS_DEV_TESTNET
-	#DEFINES *= GXS_ENABLE_SYNC_MSGS
+#	DEFINES *= GXS_DEV_TESTNET
+#	DEFINES *= GXS_ENABLE_SYNC_MSGS
 
 	HEADERS += serialiser/rsnxsitems.h \
 		gxs/rsgds.h \
diff --git a/libretroshare/src/rsserver/p3face-config.cc b/libretroshare/src/rsserver/p3face-config.cc
index 981537a85..aef64505d 100644
--- a/libretroshare/src/rsserver/p3face-config.cc
+++ b/libretroshare/src/rsserver/p3face-config.cc
@@ -159,12 +159,12 @@ void RsServer::rsGlobalShutDown()
 
 
 #ifdef RS_ENABLE_GXS
-        if(mGxsCircles) mGxsCircles->join();
+        //if(mGxsCircles) mGxsCircles->join();
         if(mGxsForums) mGxsForums->join();
         if(mGxsChannels) mGxsChannels->join();
         if(mGxsIdService) mGxsIdService->join();
         if(mPosted) mPosted->join();
-        if(mPhoto) mPhoto->join();
+        //if(mPhoto) mPhoto->join();
         if(mWiki) mWiki->join();
         if(mWire) mWire->join();
 #endif
diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
index 45cf2069f..b7fd6a2dc 100644
--- a/libretroshare/src/rsserver/rsinit.cc
+++ b/libretroshare/src/rsserver/rsinit.cc
@@ -2273,7 +2273,7 @@ int RsServer::StartupRetroShare()
 	std::string currGxsDir = RsInitConfig::configDir + "/GXS_phase1";
 
 #ifdef GXS_DEV_TESTNET // Different Directory for testing.
-	currGxsDir += "_TESTNET2";
+	currGxsDir += "_TESTNET3";
 #endif
 
         bool cleanUpGxsDir = false;
@@ -2429,8 +2429,8 @@ int RsServer::StartupRetroShare()
 
         // now add to p3service
         pqih->addService(gxsid_ns);
-        pqih->addService(gxscircles_ns);
-        pqih->addService(photo_ns);
+        //pqih->addService(gxscircles_ns);
+        //pqih->addService(photo_ns);
         pqih->addService(posted_ns);
         pqih->addService(wiki_ns);
         pqih->addService(gxsforums_ns);
@@ -2670,7 +2670,7 @@ int RsServer::StartupRetroShare()
 	/*** start up GXS core runner ***/
 	createThread(*mGxsIdService);
 	createThread(*mGxsCircles);
-	createThread(*mPhoto);
+	//createThread(*mPhoto);
 	createThread(*mPosted);
 	createThread(*mWiki);
 	createThread(*mWire);
diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
index 86344bfb1..d5ea4c8d8 100644
--- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
+++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
@@ -93,13 +93,13 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
     ui.stackPages->add(idDialog = new IdDialog(ui.stackPages),
                       createPageAction(QIcon(IMAGE_LIBRARY), tr("Identities"), grp));
 
-    CirclesDialog *circlesDialog = NULL;
-    ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages),
-                      createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp));
+//    CirclesDialog *circlesDialog = NULL;
+//    ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages),
+//                      createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp));
 
-    PhotoShare *photoShare = NULL;
-    ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages),
-                     createPageAction(QIcon(IMAGE_PHOTO), tr("Photo Share"), grp));
+//    PhotoShare *photoShare = NULL;
+//    ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages),
+//                     createPageAction(QIcon(IMAGE_PHOTO), tr("Photo Share"), grp));
 
     PostedDialog *postedDialog = NULL;
     ui.stackPages->add(postedDialog = new PostedDialog(ui.stackPages),
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 8b3394ba6..092d95746 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -5,10 +5,10 @@ CONFIG += qt gui uic qrc resources uitools idle bitdht
 #CONFIG += gxs debug
 
 gxs {
-	CONFIG += photoshare
+#	CONFIG += photoshare
 	CONFIG += wikipoos
 	CONFIG += identities
-	CONFIG += circles
+#	CONFIG += circles
 	CONFIG += gxsforums
 	CONFIG += gxschannels
 	CONFIG += posted