diff --git a/libretroshare/src/gxs/rsgenexchange.cc b/libretroshare/src/gxs/rsgenexchange.cc
index 17fd96300..6816d9476 100644
--- a/libretroshare/src/gxs/rsgenexchange.cc
+++ b/libretroshare/src/gxs/rsgenexchange.cc
@@ -973,9 +973,11 @@ int RsGenExchange::validateGrp(RsNxsGrp* grp)
 
 bool RsGenExchange::checkAuthenFlag(const PrivacyBitPos& pos, const uint8_t& flag) const
 {
+#ifdef GEN_EXCH_DEBUG
     std::cerr << "RsGenExchange::checkMsgAuthenFlag(pos: " << pos << " flag: ";
     std::cerr << (int) flag << " mAuthenPolicy: " << mAuthenPolicy << ")";
     std::cerr << std::endl;
+#endif
 
     switch(pos)
     {
diff --git a/libretroshare/src/gxs/rsgxsdataaccess.cc b/libretroshare/src/gxs/rsgxsdataaccess.cc
index bed0366e6..55c4de7d6 100644
--- a/libretroshare/src/gxs/rsgxsdataaccess.cc
+++ b/libretroshare/src/gxs/rsgxsdataaccess.cc
@@ -1031,9 +1031,10 @@ bool RsGxsDataAccess::getMsgList(const GxsMsgReq& msgIds, const RsTokReqOptions&
      * 1) No Flags => All Messages in those Groups.
      *
      */
+#ifdef DATA_DEBUG
     std::cerr << "RsGxsDataAccess::getMsgList()";
     std::cerr << std::endl;
-
+#endif
 
     bool onlyOrigMsgs = false;
     bool onlyLatestMsgs = false;
@@ -1042,21 +1043,27 @@ bool RsGxsDataAccess::getMsgList(const GxsMsgReq& msgIds, const RsTokReqOptions&
     // Can only choose one of these two.
     if (opts.mOptions & RS_TOKREQOPT_MSG_ORIGMSG)
     {
+#ifdef DATA_DEBUG
             std::cerr << "RsGxsDataAccess::getMsgList() MSG_ORIGMSG";
             std::cerr << std::endl;
+#endif
             onlyOrigMsgs = true;
     }
     else if (opts.mOptions & RS_TOKREQOPT_MSG_LATEST)
     {
+#ifdef DATA_DEBUG
             std::cerr << "RsGxsDataAccess::getMsgList() MSG_LATEST";
             std::cerr << std::endl;
+#endif
             onlyLatestMsgs = true;
     }
 
     if (opts.mOptions & RS_TOKREQOPT_MSG_THREAD)
     {
+#ifdef DATA_DEBUG
             std::cerr << "RsGxsDataAccess::getMsgList() MSG_THREAD";
             std::cerr << std::endl;
+#endif
             onlyThreadHeadMsgs = true;
     }
 
diff --git a/libretroshare/src/gxs/rsgxsnetservice.cc b/libretroshare/src/gxs/rsgxsnetservice.cc
index 1f9a186f3..f2d2df4a7 100644
--- a/libretroshare/src/gxs/rsgxsnetservice.cc
+++ b/libretroshare/src/gxs/rsgxsnetservice.cc
@@ -1820,7 +1820,9 @@ void RsGxsNetService::locked_pushMsgTransactionFromList(std::list<RsNxsItem*>& r
     if (!locked_addTransaction(newTrans))
         delete newTrans;
 
+#ifdef NXS_NET_DEBUG
     std::cerr << "  Requested new transaction for " << reqList.size() << " items." << std::endl;
+#endif
 }
 
 void RsGxsNetService::locked_genReqMsgTransaction(NxsTransaction* tr)
diff --git a/libretroshare/src/services/p3idservice.cc b/libretroshare/src/services/p3idservice.cc
index edb8cc2c2..f9d868074 100644
--- a/libretroshare/src/services/p3idservice.cc
+++ b/libretroshare/src/services/p3idservice.cc
@@ -255,7 +255,9 @@ bool p3IdService::loadList(std::list<RsItem*>& items)
 
 bool p3IdService::saveList(bool& cleanup,std::list<RsItem*>& items)
 {
+#ifdef DEBUG_IDS
     std::cerr << "p3IdService::saveList()" << std::endl;
+#endif
 
     RS_STACK_MUTEX(mIdMtx) ;
     cleanup = true ;