diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java
index edc5b1c..9ed748c 100644
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java
@@ -56,10 +56,6 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem
 
 	public final static String TEST_USER = "test.user";
 	public final static String TEST_SCOPE = "/gcube/devsec/devVRE";
-	// TO BE REMOVED TODO
-	public final static String PRODUCTION_SCOPE_ROOT = "/d4science.research-infrastructures.eu";
-	public final static String PRODUCTION_CKAN_ORGNAME_ROOT = "d4science";
-	public final static String PRODUCTION_LIFERAY_ORGNAME_ROOT = "d4science";
 	public final static String TEST_MAIL = "test.user@test-com";
 	public final static String TEST_SEC_TOKEN = "4620e6d0-2313-4f48-9d54-eb3efd01a810";
 
@@ -86,8 +82,8 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem
 			if(user.equals(TEST_USER)){ 
 				// session expired or, maybe, outside the portal
 				logger.warn("User is "+TEST_USER +" are we out from portal?");
-				logger.warn("I'm using root scope "+PRODUCTION_SCOPE_ROOT);
-				instance = new CKanUtilsImpl(PRODUCTION_SCOPE_ROOT);
+				logger.warn("I'm using root scope "+ CKanUtilsImpl.PRODUCTION_SCOPE_ROOT);
+				instance = new CKanUtilsImpl(CKanUtilsImpl.PRODUCTION_SCOPE_ROOT);
 			}else{
 				if(discoverScope != null && !discoverScope.isEmpty())
 					instance = new CKanUtilsImpl(discoverScope);
diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java
index f9fc0de..ca40675 100644
--- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java
+++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/UserUtil.java
@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.gcube.datacatalogue.ckanutillibrary.CKanUtils;
+import org.gcube.datacatalogue.ckanutillibrary.CKanUtilsImpl;
 import org.gcube.datacatalogue.ckanutillibrary.models.RolesIntoOrganization;
 import org.gcube.portlets.gcubeckan.gcubeckandatacatalog.shared.CkanRole;
 import org.gcube.portlets.widgets.ckandatapublisherwidget.shared.OrganizationBean;
@@ -209,8 +210,7 @@ public class UserUtil {
 				// get the orgs of the user 
 				List<CkanOrganization> ckanOrgs = ckanUtils.getOrganizationsByUser(username);
 				for (CkanOrganization ckanOrganization : ckanOrgs) {
-					if(gCubeGroupName.equals(GcubeCkanDataCatalogServiceImpl.PRODUCTION_LIFERAY_ORGNAME_ROOT) ||
-							ckanOrganization.getName().equals(gCubeGroupName.toLowerCase())){
+					if(ckanOrganization.getName().equals(gCubeGroupName.toLowerCase()) || ckanOrganization.getName().equals(CKanUtilsImpl.PRODUCTION_CKAN_ORGNAME_ROOT)){
 						orgsInWhichAdminRole.add(new OrganizationBean(ckanOrganization.getTitle(), ckanOrganization.getName()));
 						break;
 					}