diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index 5b6df469b..944e1b332 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -1,15 +1,13 @@
 TEMPLATE = lib
-CONFIG += static release
+CONFIG += staticlib release
 TARGET = retroshare
 
-DEFINES -= PQI_USE_XPGP
-DEFINES += RS_USE_PGPSSL
-
 profiling {
 	QMAKE_CXXFLAGS -= -fomit-frame-pointer
 	QMAKE_CXXFLAGS *= -pg -g -fno-omit-frame-pointer
 }
 
+#CONFIG += debug
 debug {
 #	DEFINES *= DEBUG
 #	DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG
@@ -18,7 +16,8 @@ debug {
 #        DEFINES *= CONN_DEBUG P3DISC_DEBUG RSSERIAL_DEBUG RSITEM_DEBUG DEBUG_PQISSL DEBUG_PQISTREAMER
 #	DEFINES *= NET_DEBUG
 #	DEFINES *= DISTRIB_DEBUG
-	QMAKE_CXXFLAGS *= -g
+        QMAKE_CXXFLAGS -= -fomit-frame-pointer
+        QMAKE_CXXFLAGS *= -g -fno-omit-frame-pointer
 }
 
 ################################# Linux ##########################################
diff --git a/libretroshare/src/pqi/authssl.h b/libretroshare/src/pqi/authssl.h
index 2d61f1de5..47faaee55 100644
--- a/libretroshare/src/pqi/authssl.h
+++ b/libretroshare/src/pqi/authssl.h
@@ -33,7 +33,6 @@
  * only the owner ssl cert is store, the rest is jeus callback verification
  * 	
  * To use as an SSL authentication system, you must use a common CA certificate.
- * and compilation should be done with PQI_USE_XPGP off, and PQI_USE_SSLONLY on
  *  * The pqissl stuff doesn't need to differentiate between SSL, SSL + PGP,
  *  as its X509 certs.
  *  * The rsserver stuff has to distinguish between all three types ;(
diff --git a/libretroshare/src/pqi/pqissl.h b/libretroshare/src/pqi/pqissl.h
index e784e545a..261579ba3 100644
--- a/libretroshare/src/pqi/pqissl.h
+++ b/libretroshare/src/pqi/pqissl.h
@@ -40,14 +40,7 @@
 
 #include "pqi/p3connmgr.h"
 
-/**************** PQI_USE_XPGP ******************/
-#if defined(PQI_USE_XPGP)
-#include "pqi/authxpgp.h"
-#else /* X509 Certificates */
-/**************** PQI_USE_XPGP ******************/
 #include "pqi/authssl.h"
-#endif /* X509 Certificates */
-/**************** PQI_USE_XPGP ******************/
 
 #define WAITING_NOT            0
 #define WAITING_DELAY	       1
diff --git a/libretroshare/src/rsserver/p3peers.cc b/libretroshare/src/rsserver/p3peers.cc
index 173016fea..4e98afd08 100644
--- a/libretroshare/src/rsserver/p3peers.cc
+++ b/libretroshare/src/rsserver/p3peers.cc
@@ -36,9 +36,7 @@
 #include <fstream>
 #include <sstream>
 
-#ifdef RS_USE_PGPSSL
-	#include <gpgme.h>
-#endif
+#include <gpgme.h>
 
 const std::string CERT_SSL_ID = "--SSLID--";
 const std::string CERT_LOCATION = "--LOCATION--";
diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro
index f70608edd..90a8b22d2 100644
--- a/retroshare-gui/src/RetroShare.pro
+++ b/retroshare-gui/src/RetroShare.pro
@@ -1,14 +1,20 @@
-CONFIG += qt gui uic qrc resources uitools pluginmgr newsettings install_rs
-QT     += network xml script opengl
+CONFIG += qt newsettings install_rs thread release
+#CONFIG += pluginmgr
+QT     += network xml
 TEMPLATE = app
 TARGET = RetroShare
 
-DEFINES *= RS_RELEASE_VERSION
-DEFINES += RS_USE_PGPSSL
+DEFINES += RS_RELEASE_VERSION
 RCC_DIR = temp/qrc
 UI_DIR  = temp/ui
 MOC_DIR = temp/moc
 
+#CONFIG += debug
+debug {
+        DEFINES+*= PEERS_DEBUG
+        QMAKE_CXXFLAGS *= -g
+}
+
 ################################# Linux ##########################################
 # Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
 linux-* {
diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp
index 1335af2e7..d2c3810be 100644
--- a/retroshare-gui/src/gui/NetworkDialog.cpp
+++ b/retroshare-gui/src/gui/NetworkDialog.cpp
@@ -38,9 +38,7 @@
 /* for GPGME */
 #include "rsiface/rsinit.h"
 
-#ifdef RS_USE_PGPSSL
-	#include <gpgme.h>
-#endif
+#include <gpgme.h>
 
 #include <sstream>
 
diff --git a/retroshare-gui/src/gui/NetworkView.cpp b/retroshare-gui/src/gui/NetworkView.cpp
index 0498eb87d..782cdc6b0 100644
--- a/retroshare-gui/src/gui/NetworkView.cpp
+++ b/retroshare-gui/src/gui/NetworkView.cpp
@@ -25,9 +25,7 @@
 
 #include "rsiface/rsinit.h"
 
-#ifdef RS_USE_PGPSSL
-	#include <gpgme.h>
-#endif
+#include <gpgme.h>
 
 #include <QMenu>
 #include <QMouseEvent>
@@ -168,8 +166,6 @@ void  NetworkView::insertPeers()
 			continue;
 		}
 
-#ifdef RS_USE_PGPSSL
-
 		/* *** */
                 RsPeerDetails detail;
 		if (!rsPeers->getPeerDetails(*it, detail))
@@ -205,37 +201,6 @@ void  NetworkView::insertPeers()
 		}
   		ui.graphicsView->addNode(type, *it, detail.name);
 
-
-
-#else
-                /* *** */
-                std::string name = rsPeers->getPeerName(*it);
-
-                if (rsPeers->isFriend(*it))
-                {
-                        type = ELASTIC_NODE_TYPE_FRIEND;
-                }
-                else
-                {
-                        RsPeerDetails detail;
-                        rsPeers->getPeerDetails(*it, detail);
-
-                        if(detail.trustLvl > RS_TRUST_LVL_MARGINAL)
-                        {
-                                type = ELASTIC_NODE_TYPE_AUTHED;
-                        }
-                        else if (detail.trustLvl >= RS_TRUST_LVL_MARGINAL)
-                        {
-                                type = ELASTIC_NODE_TYPE_MARGINALAUTH;
-                        }
-                        else
-                        {
-                                type = ELASTIC_NODE_TYPE_FOF;
-                        }
-                }
-  		ui.graphicsView->addNode(type, *it, name);
-#endif
-
 		std::cerr << "NetworkView::insertPeers() Added Friend: " << *it << std::endl;
 	}