diff --git a/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java b/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java
index c0ab9ba..27637a4 100644
--- a/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/FrontEndLinkURIAuthenticationSuccessHandler.java
@@ -1,5 +1,6 @@
 package eu.dnetlib.repo.manager.config;
 
+import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import org.apache.log4j.Logger;
 import org.mitre.openid.connect.model.OIDCAuthenticationToken;
@@ -13,7 +14,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
-import com.google.gson.*;
 
 public class FrontEndLinkURIAuthenticationSuccessHandler implements AuthenticationSuccessHandler {
 
diff --git a/src/main/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java b/src/main/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java
index f868a28..cf114d0 100644
--- a/src/main/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java
+++ b/src/main/java/eu/dnetlib/repo/manager/config/SwaggerConfig.java
@@ -1,12 +1,7 @@
 package eu.dnetlib.repo.manager.config;
 
 import eu.dnetlib.repo.manager.controllers.*;
-import eu.dnetlib.repo.manager.service.MonitorService;
-import eu.dnetlib.repo.manager.service.PiWikService;
-import eu.dnetlib.repo.manager.service.RepositoryService;
-import eu.dnetlib.repo.manager.service.ValidatorService;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
-import org.springframework.cloud.netflix.hystrix.EnableHystrix;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/BrokerController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/BrokerController.java
index 49dd75f..48b559a 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/BrokerController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/BrokerController.java
@@ -1,9 +1,9 @@
 package eu.dnetlib.repo.manager.controllers;
 
-import eu.dnetlib.repo.manager.service.BrokerServiceImpl;
 import eu.dnetlib.repo.manager.domain.BrokerException;
 import eu.dnetlib.repo.manager.domain.Term;
 import eu.dnetlib.repo.manager.domain.broker.*;
+import eu.dnetlib.repo.manager.service.BrokerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import org.json.JSONException;
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java
index a378904..6771afb 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/DashboardController.java
@@ -1,16 +1,10 @@
 package eu.dnetlib.repo.manager.controllers;
 
-import eu.dnetlib.repo.manager.domain.BrokerSummary;
-import eu.dnetlib.repo.manager.domain.CollectionMonitorSummary;
-import eu.dnetlib.repo.manager.domain.RepositorySummaryInfo;
-import eu.dnetlib.repo.manager.domain.UsageSummary;
+import eu.dnetlib.repo.manager.domain.*;
 import eu.dnetlib.repo.manager.service.BrokerService;
 import eu.dnetlib.repo.manager.service.DashboardService;
 import eu.dnetlib.repo.manager.service.PiWikService;
 import eu.dnetlib.repo.manager.service.RepositoryService;
-import eu.dnetlib.repo.manager.domain.AggregationDetails;
-import eu.dnetlib.repo.manager.domain.BrokerException;
-import eu.dnetlib.repo.manager.domain.RepositoryServiceException;
 import io.swagger.annotations.Api;
 import org.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java b/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java
index b2e2090..99be087 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/GenericControllerAdvice.java
@@ -2,10 +2,10 @@ package eu.dnetlib.repo.manager.controllers;
 
 
 import eu.dnetlib.api.functionality.ValidatorServiceException;
+import eu.dnetlib.repo.manager.domain.BrokerException;
 import eu.dnetlib.repo.manager.exception.EndPointException;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
 import eu.dnetlib.repo.manager.exception.ServerError;
-import eu.dnetlib.repo.manager.domain.BrokerException;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.json.JSONException;
@@ -13,7 +13,10 @@ import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.AccessDeniedException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
 import javax.servlet.http.HttpServletRequest;
 import java.net.UnknownHostException;
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java
index a283368..ad11e22 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/MonitorController.java
@@ -2,8 +2,8 @@ package eu.dnetlib.repo.manager.controllers;
 
 import eu.dnetlib.api.functionality.ValidatorServiceException;
 import eu.dnetlib.domain.functionality.validator.StoredJob;
-import eu.dnetlib.repo.manager.service.MonitorServiceImpl;
 import eu.dnetlib.repo.manager.domain.JobsOfUser;
+import eu.dnetlib.repo.manager.service.MonitorServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import org.apache.log4j.Logger;
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
index 68c5e40..d9c1b5e 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/PiWikController.java
@@ -4,9 +4,9 @@ import eu.dnetlib.domain.data.PiwikInfo;
 import eu.dnetlib.repo.manager.domain.OrderByField;
 import eu.dnetlib.repo.manager.domain.OrderByType;
 import eu.dnetlib.repo.manager.domain.Paging;
+import eu.dnetlib.repo.manager.domain.RepositoryServiceException;
 import eu.dnetlib.repo.manager.service.PiWikServiceImpl;
 import eu.dnetlib.repo.manager.service.RepositoryService;
-import eu.dnetlib.repo.manager.domain.RepositoryServiceException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/StatsController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/StatsController.java
index 10e8925..b48ebab 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/StatsController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/StatsController.java
@@ -2,7 +2,6 @@ package eu.dnetlib.repo.manager.controllers;
 
 import eu.dnetlib.repo.manager.service.StatsServiceImpl;
 import io.swagger.annotations.Api;
-import org.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/src/main/java/eu/dnetlib/repo/manager/controllers/ValidatorController.java b/src/main/java/eu/dnetlib/repo/manager/controllers/ValidatorController.java
index ef12c8a..16ad335 100644
--- a/src/main/java/eu/dnetlib/repo/manager/controllers/ValidatorController.java
+++ b/src/main/java/eu/dnetlib/repo/manager/controllers/ValidatorController.java
@@ -1,17 +1,14 @@
 package eu.dnetlib.repo.manager.controllers;
 
 import eu.dnetlib.api.functionality.ValidatorServiceException;
+import eu.dnetlib.domain.functionality.validator.JobForValidation;
+import eu.dnetlib.domain.functionality.validator.RuleSet;
 import eu.dnetlib.domain.functionality.validator.StoredJob;
+import eu.dnetlib.repo.manager.domain.InterfaceInformation;
+import eu.dnetlib.repo.manager.domain.ValidationServiceException;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
 import eu.dnetlib.repo.manager.service.EmailUtils;
 import eu.dnetlib.repo.manager.service.ValidatorServiceImpl;
-import eu.dnetlib.repo.manager.domain.InterfaceInformation;
-import eu.dnetlib.repo.manager.domain.ValidationServiceException;
-import eu.dnetlib.domain.functionality.validator.JobForValidation;
-import eu.dnetlib.domain.functionality.validator.RuleSet;
-
-import java.util.*;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import org.json.JSONException;
@@ -21,6 +18,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 @RestController
 @RequestMapping(value = "/validator")
diff --git a/src/main/java/eu/dnetlib/repo/manager/exception/EndPointException.java b/src/main/java/eu/dnetlib/repo/manager/exception/EndPointException.java
index d4f5051..195ae81 100644
--- a/src/main/java/eu/dnetlib/repo/manager/exception/EndPointException.java
+++ b/src/main/java/eu/dnetlib/repo/manager/exception/EndPointException.java
@@ -1,8 +1,5 @@
 package eu.dnetlib.repo.manager.exception;
 
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
 import java.io.IOException;
 
 //@ResponseStatus(HttpStatus.GATEWAY_TIMEOUT)
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java
index eecde29..0f16a3b 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java
@@ -1,11 +1,7 @@
 package eu.dnetlib.repo.manager.service;
 
 import eu.dnetlib.domain.data.Repository;
-import eu.dnetlib.repo.manager.domain.RepositorySummaryInfo;
-import eu.dnetlib.repo.manager.domain.AggregationDetails;
-import eu.dnetlib.repo.manager.domain.BrokerException;
-import eu.dnetlib.repo.manager.domain.MetricsInfo;
-import eu.dnetlib.repo.manager.domain.RepositoryServiceException;
+import eu.dnetlib.repo.manager.domain.*;
 import eu.dnetlib.repo.manager.domain.broker.BrowseEntry;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java
index 81e6dbb..3b07ea5 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/MonitorServiceImpl.java
@@ -2,7 +2,6 @@ package eu.dnetlib.repo.manager.service;
 
 import eu.dnetlib.api.functionality.ValidatorService;
 import eu.dnetlib.api.functionality.ValidatorServiceException;
-import eu.dnetlib.domain.functionality.validator.JobForValidation;
 import eu.dnetlib.domain.functionality.validator.StoredJob;
 import eu.dnetlib.repo.manager.domain.Constants;
 import eu.dnetlib.repo.manager.domain.JobsOfUser;
@@ -15,9 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import javax.mail.Store;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryService.java b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryService.java
index 0e721c1..20aeaa8 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/RepositoryService.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/RepositoryService.java
@@ -7,6 +7,7 @@ import eu.dnetlib.repo.manager.domain.*;
 import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
 import org.json.JSONException;
 import org.springframework.security.core.Authentication;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/StatsService.java b/src/main/java/eu/dnetlib/repo/manager/service/StatsService.java
index 3a2da65..f379de0 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/StatsService.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/StatsService.java
@@ -1,9 +1,5 @@
 package eu.dnetlib.repo.manager.service;
 
-import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
-import eu.dnetlib.repo.manager.exception.EndPointException;
-import org.json.JSONException;
-
 import java.util.Map;
 
 
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/SushiliteServiceImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/SushiliteServiceImpl.java
index 76e7e28..3344a6e 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/SushiliteServiceImpl.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/SushiliteServiceImpl.java
@@ -10,8 +10,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
diff --git a/src/main/java/eu/dnetlib/repo/manager/service/ValidatorService.java b/src/main/java/eu/dnetlib/repo/manager/service/ValidatorService.java
index d4231d2..5b6c93f 100644
--- a/src/main/java/eu/dnetlib/repo/manager/service/ValidatorService.java
+++ b/src/main/java/eu/dnetlib/repo/manager/service/ValidatorService.java
@@ -4,9 +4,9 @@ import eu.dnetlib.api.functionality.ValidatorServiceException;
 import eu.dnetlib.domain.functionality.validator.JobForValidation;
 import eu.dnetlib.domain.functionality.validator.RuleSet;
 import eu.dnetlib.domain.functionality.validator.StoredJob;
-import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
 import eu.dnetlib.repo.manager.domain.InterfaceInformation;
 import eu.dnetlib.repo.manager.domain.ValidationServiceException;
+import eu.dnetlib.repo.manager.exception.ResourceNotFoundException;
 import org.json.JSONException;
 import org.springframework.http.ResponseEntity;
 
diff --git a/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java b/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java
index 85a7bd8..958704f 100644
--- a/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java
+++ b/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java
@@ -2,11 +2,10 @@ package eu.dnetlib.repo.manager.utils;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.dnetlib.domain.data.PiwikInfo;
 import eu.dnetlib.domain.data.Repository;
 import eu.dnetlib.domain.data.RepositoryInterface;
-import eu.dnetlib.repo.manager.domain.RepositorySnippet;
 import eu.dnetlib.repo.manager.domain.AggregationDetails;
+import eu.dnetlib.repo.manager.domain.RepositorySnippet;
 import eu.dnetlib.repo.manager.domain.Timezone;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.log4j.Logger;
diff --git a/src/main/java/eu/dnetlib/repo/manager/utils/OaiTools.java b/src/main/java/eu/dnetlib/repo/manager/utils/OaiTools.java
index 855042f..93c0d5f 100644
--- a/src/main/java/eu/dnetlib/repo/manager/utils/OaiTools.java
+++ b/src/main/java/eu/dnetlib/repo/manager/utils/OaiTools.java
@@ -4,7 +4,6 @@ import org.apache.log4j.Logger;
 import org.dom4j.io.DOMWriter;
 import org.w3c.dom.Document;
 import se.kb.oai.pmh.*;
-import se.kb.oai.pmh.Set;
 
 import javax.net.ssl.*;
 import javax.xml.namespace.NamespaceContext;
@@ -14,7 +13,10 @@ import javax.xml.xpath.XPathFactory;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.X509Certificate;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 
 public class OaiTools {