diff --git a/src/main/java/org/gcube/social_networking/social_networking_client_library/BaseClient.java b/src/main/java/org/gcube/social_networking/social_networking_client_library/BaseClient.java
index 87cad83..8817096 100644
--- a/src/main/java/org/gcube/social_networking/social_networking_client_library/BaseClient.java
+++ b/src/main/java/org/gcube/social_networking/social_networking_client_library/BaseClient.java
@@ -14,17 +14,12 @@ public abstract class BaseClient {
 		private String serviceEndpoint;
 
 		public BaseClient(String subPath) throws Exception {
-			//ServiceDiscoverer discoverer = new ServiceDiscoverer();
-			//serviceEndpoint = discoverer.getEntryPoint();
+			ServiceDiscoverer discoverer = new ServiceDiscoverer();
+			serviceEndpoint = discoverer.getEntryPoint();
 			logger.debug("Discovering service...");
 
-
 			logger.debug(" \n\n\n *** I found " + serviceEndpoint);
 
-			serviceEndpoint = "https://api.dev.d4science.org/rest";
-
-			logger.debug("\n replacing it with "+ serviceEndpoint);
-
 			serviceEndpoint = serviceEndpoint.endsWith("/") ? serviceEndpoint + subPath :
 					serviceEndpoint + "/" + subPath;
 			logger.info("\n\n ABZ Discovered service " + serviceEndpoint);