diff --git a/src/main/java/org/gcube/common/authorizationservice/TokenManager.java b/src/main/java/org/gcube/common/authorizationservice/TokenManager.java
index 5f3e8c7..f2c1120 100644
--- a/src/main/java/org/gcube/common/authorizationservice/TokenManager.java
+++ b/src/main/java/org/gcube/common/authorizationservice/TokenManager.java
@@ -34,9 +34,6 @@ import org.gcube.common.authorization.library.utils.MultiServiceTokenRequest;
 import org.gcube.common.authorizationservice.filters.AuthorizedCallFilter;
 import org.gcube.common.authorizationservice.util.Constants;
 import org.gcube.common.authorizationservice.util.TokenPersistence;
-import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.common.scope.api.ServiceMap;
-import org.gcube.common.scope.impl.ScopedServiceMap;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -80,6 +77,7 @@ public class TokenManager {
 					.entity("token "+token+" not found").type(MediaType.TEXT_PLAIN).build());
 		}
 
+		/*
 		try{
 			ScopeProvider.instance.set(info.getContext());
 			ServiceMap map =  ((ScopedServiceMap)ServiceMap.instance).currentMap();
@@ -87,7 +85,7 @@ public class TokenManager {
 			info.setMap(map);
 		}catch(Throwable e){
 			log.error("error retrieving map for {}", info.getContext(), e);
-		}
+		}*/
 		log.debug("returning info {}", info);
 		return info;
 
@@ -105,21 +103,22 @@ public class TokenManager {
 	@Produces(MediaType.APPLICATION_XML)
 	public AuthorizationEntryList retrieveTokenBunch(@NotNull @QueryParam("token") List<String> tokens ) {
 		CalledMethodProvider.instance.set("retrieve");
-		log.info("token retreiver called with tokens {}",tokens);
+		log.info("token retreiver in bunch called with tokens {}",tokens);
 
 		List<AuthorizationEntry> toReturn = new ArrayList<AuthorizationEntry>();
 		for (String token : tokens ) {
 			try {
 				AuthorizationEntry info = persistence.getAuthorizationEntry(token);
-				
+				/*
 				try{
 					ScopeProvider.instance.set(info.getContext());
-					ServiceMap map =  ((ScopedServiceMap)ServiceMap.instance).currentMap();
+					DefaultServiceMap map =  (DefaultServiceMap)((ScopedServiceMap)ServiceMap.instance).currentMap();
 					ScopeProvider.instance.reset();
 					info.setMap(map);
 				}catch(Throwable e){
 					log.error("error retrieving map for {}", info.getContext(), e);
 				}
+				*/
 				toReturn.add(info);
 			}catch(Exception t) {
 				log.error("erorr on authorization", t);
diff --git a/src/main/java/org/gcube/common/authorizationservice/filters/AuthorizedCallFilter.java b/src/main/java/org/gcube/common/authorizationservice/filters/AuthorizedCallFilter.java
index 07c3984..f047fbd 100644
--- a/src/main/java/org/gcube/common/authorizationservice/filters/AuthorizedCallFilter.java
+++ b/src/main/java/org/gcube/common/authorizationservice/filters/AuthorizedCallFilter.java
@@ -16,9 +16,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.gcube.accounting.datamodel.UsageRecord.OperationResult;
-import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord;
-import org.gcube.accounting.persistence.AccountingPersistence;
-import org.gcube.accounting.persistence.AccountingPersistenceFactory;
 import org.gcube.common.authorization.library.AuthorizationEntry;
 import org.gcube.common.authorization.library.provider.CalledMethodProvider;
 import org.gcube.common.authorizationservice.configuration.AllowedEntity;
@@ -26,7 +23,6 @@ import org.gcube.common.authorizationservice.configuration.AuthorizationConfigur
 import org.gcube.common.authorizationservice.configuration.AuthorizationRule;
 import org.gcube.common.authorizationservice.configuration.ConfigurationHolder;
 import org.gcube.common.authorizationservice.util.TokenPersistence;
-import org.gcube.common.scope.api.ScopeProvider;
 
 import lombok.extern.slf4j.Slf4j;