diff --git a/libretroshare/src/dbase/fimonitor.cc b/libretroshare/src/dbase/fimonitor.cc
index 824ea8397..6d0e9de75 100644
--- a/libretroshare/src/dbase/fimonitor.cc
+++ b/libretroshare/src/dbase/fimonitor.cc
@@ -39,8 +39,6 @@
 /***********
  * #define FIM_DEBUG 1
  ***********/
- 
-#define FIM_DEBUG 1
 
 FileIndexMonitor::FileIndexMonitor(CacheStrapper *cs, std::string cachedir, std::string pid)
 	:CacheSource(RS_SERVICE_TYPE_FILE_INDEX, false, cs, cachedir), fi(pid), 
@@ -187,8 +185,6 @@ void 	FileIndexMonitor::setPeriod(int period)
 
 void 	FileIndexMonitor::run()
 {
-		std::cerr << "FileIndexMonitor::run() ";
-		std::cerr << std::endl;
 
 	updateCycle();
 
@@ -221,8 +217,6 @@ void 	FileIndexMonitor::run()
 
 void 	FileIndexMonitor::updateCycle()
 {
-		std::cerr << "FileIndexMonitor::updateCycle() ";
-		std::cerr << std::endl;
 	time_t startstamp = time(NULL);
 
 	/* iterate through all out-of-date directories */
diff --git a/libretroshare/src/dbase/findex.cc b/libretroshare/src/dbase/findex.cc
index 950842d19..912e269cc 100644
--- a/libretroshare/src/dbase/findex.cc
+++ b/libretroshare/src/dbase/findex.cc
@@ -36,8 +36,6 @@
 /****
  * #define FI_DEBUG 1
  ****/
- 
-#define FI_DEBUG 1
 
 
 DirEntry::~DirEntry()
diff --git a/libretroshare/src/dbase/fistore.cc b/libretroshare/src/dbase/fistore.cc
index dd4e52ac8..84e7d75c8 100644
--- a/libretroshare/src/dbase/fistore.cc
+++ b/libretroshare/src/dbase/fistore.cc
@@ -43,9 +43,6 @@ FileIndexStore::~FileIndexStore()
  * #define FIS_DEBUG2 1
  * #define FIS_DEBUG 1
  **/
- 
-#define FIS_DEBUG2 1
-#define FIS_DEBUG 1
 
 	  /* actual load, once data available */
 int FileIndexStore::loadCache(const CacheData &data)
diff --git a/libretroshare/src/server/filedexserver.cc b/libretroshare/src/server/filedexserver.cc
index b41b101a9..753e3d390 100644
--- a/libretroshare/src/server/filedexserver.cc
+++ b/libretroshare/src/server/filedexserver.cc
@@ -58,8 +58,6 @@ const int fldxsrvrzone = 47659;
 #define SERVER_DEBUG 1
 #define DEBUG_TICK 1
 ****/
-#define SERVER_DEBUG 1
-#define DEBUG_TICK 1
 
 filedexserver::filedexserver()
 	:p3Config(CONFIG_TYPE_FSERVER), 
@@ -285,15 +283,9 @@ void    filedexserver::setFileCallback(std::string ownId, CacheStrapper *strappe
 
 void    filedexserver::StartupMonitor()
 {
-	std::cerr << "filedexserver::StartupMonitor() err" << std::endl;
-
-	pqioutput(PQL_DEBUG_BASIC, fldxsrvrzone, 
-		"filedexserver::StartupMonitor()");
-
 	/* startup the FileMonitor (after cache load) */
-	fimon->setPeriod(100); /* 10 minutes */
-        /* start it up */
-	
+	fimon->setPeriod(600); /* 10 minutes */
+	/* start it up */
 	fimon->setSharedDirectories(dbase_dirs);
 	fimon->start();
 
diff --git a/libretroshare/src/server/ft.cc b/libretroshare/src/server/ft.cc
index aec1da8cc..0f6d8f341 100644
--- a/libretroshare/src/server/ft.cc
+++ b/libretroshare/src/server/ft.cc
@@ -30,7 +30,6 @@
  * #define FT_DEBUG 1
  ***/
 
- #define FT_DEBUG 1
 
 bool	ftManager::lookupLocalHash(std::string hash, std::string &path, uint64_t &size)
 {
diff --git a/libretroshare/src/server/ftfiler.cc b/libretroshare/src/server/ftfiler.cc
index 67aa09de1..2d3e55849 100644
--- a/libretroshare/src/server/ftfiler.cc
+++ b/libretroshare/src/server/ftfiler.cc
@@ -41,8 +41,6 @@ const int ftfilerzone = 86539;
  * #define FT_DEBUG 1
  ***/
 
-#define FT_DEBUG 1
-
 /* 
  * PQI Filer
  *
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 7e5490d00..e10858485 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -25,7 +25,7 @@
 #include <gui/MainWindow.h>
 #include <gui/StartDialog.h>
 #include <gui/GenCertDialog.h>
-//#include <Gui/Preferences/Rsharesettings.h>
+#include <Gui/Preferences/Rsharesettings.h>
 
 /*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers.
 #include <gui/qskinobject/qskinobject.h>