diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/FingerPrintComponent.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/FingerPrintComponent.java
index 54b77dadf..a17ea8a21 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/FingerPrintComponent.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/component/FingerPrintComponent.java
@@ -19,15 +19,6 @@
 
 package org.alfresco.solr.component;
 
-import java.io.IOException;
-import java.util.*;
-
-import org.alfresco.repo.search.adaptor.lucene.QueryConstants;
-import org.alfresco.repo.tenant.TenantService;
-import org.alfresco.solr.AlfrescoCoreAdminHandler;
-import org.alfresco.solr.AlfrescoSolrDataModel;
-import org.alfresco.solr.SolrInformationServer;
-import org.alfresco.solr.content.SolrContentStore;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.index.Term;
@@ -36,22 +27,22 @@ import org.apache.lucene.search.Query;
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
-import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.common.SolrInputField;
 import org.apache.solr.common.util.NamedList;
-import org.apache.solr.core.CoreContainer;
 import org.apache.solr.core.SolrCore;
-import org.apache.solr.handler.component.*;
-import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.handler.component.ResponseBuilder;
+import org.apache.solr.handler.component.SearchComponent;
 import org.apache.solr.response.DocsStreamer;
 import org.apache.solr.schema.IndexSchema;
 import org.apache.solr.schema.SchemaField;
-import org.apache.solr.search.DocIterator;
-import org.apache.solr.search.DocListAndSet;
 import org.apache.solr.search.SolrIndexSearcher;
 import org.apache.solr.util.plugin.SolrCoreAware;
 
-import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_FINGERPRINT;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_LID;
 
 /**
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
index 54e3fb88a..7c060f48b 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
@@ -18,28 +18,7 @@
  */
 package org.alfresco.solr.query;
 
-import java.io.IOException;
-import java.io.StringReader;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.dictionary.IndexTokenisationMode;
 import org.alfresco.repo.search.MLAnalysisMode;
@@ -123,8 +102,6 @@ import org.apache.solr.client.solrj.impl.HttpClientUtil;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.common.SolrInputField;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.NamedList;
@@ -142,7 +119,28 @@ import org.jaxen.saxpath.base.XPathReader;
 import org.json.JSONObject;
 import org.springframework.extensions.surf.util.I18NUtil;
 
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+import java.io.IOException;
+import java.io.StringReader;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author Andy