3 files changed, 10 insertions, 10 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/BoolField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/BoolField.java
index c0f42f6924b..6a980c37f4e 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/BoolField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/BoolField.java
@@ -7,7 +7,6 @@
 package com.yahoo.prelude.fastsearch;
 
 import com.yahoo.data.access.Inspector;
-import com.yahoo.search.result.NanNumber;
 
 /**
  * @author bratseth
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/IndexedBackend.java
index 85b7770a8b2..294aff8d78b 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/IndexedBackend.java
@@ -30,7 +30,7 @@ import java.util.Optional;
 // errors on results and returning them. It could be handy to create a QueryHandlingErrorException
 // or similar which could wrap an error message, and then just always throw that and
 // catch and unwrap into a results with an error in high level methods.  -Jon
-public class FastSearcher extends VespaBackEndSearcher {
+public class IndexedBackend extends VespaBackend {
 
     /** Used to dispatch directly to search nodes over RPC, replacing the old fnet communication path */
     private final Dispatcher dispatcher;
@@ -48,12 +48,12 @@ public class FastSearcher extends VespaBackEndSearcher {
      * @param clusterParams the cluster number, and other cluster backend parameters
      * @param documentdbInfoConfig document database parameters
      */
-    public FastSearcher(String serverId,
-                        Dispatcher dispatcher,
-                        SummaryParameters docSumParams,
-                        ClusterParams clusterParams,
-                        DocumentdbInfoConfig documentdbInfoConfig,
-                        SchemaInfo schemaInfo) {
+    public IndexedBackend(String serverId,
+                          Dispatcher dispatcher,
+                          SummaryParameters docSumParams,
+                          ClusterParams clusterParams,
+                          DocumentdbInfoConfig documentdbInfoConfig,
+                          SchemaInfo schemaInfo) {
         init(serverId, docSumParams, clusterParams, documentdbInfoConfig, schemaInfo);
         this.dispatcher = dispatcher;
     }
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackend.java
index 340262ed186..5191bfc4f41 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackend.java
@@ -31,7 +31,7 @@ import java.util.Optional;
  *
  * @author baldersheim
  */
-public abstract class VespaBackEndSearcher {
+public abstract class VespaBackend {
 
     /** for vespa-internal use only; consider renaming the summary class */
     public static final String SORTABLE_ATTRIBUTES_SUMMARY_CLASS = "attributeprefetch";
@@ -184,7 +184,7 @@ public abstract class VespaBackEndSearcher {
         return result;
     }
 
-    private List<Result> partitionHits(Result result, String summaryClass) {
+    private static List<Result> partitionHits(Result result, String summaryClass) {
         List<Result> parts = new ArrayList<>();
         TinyIdentitySet<Query> queryMap = new TinyIdentitySet<>(4);
 
@@ -210,6 +210,7 @@ public abstract class VespaBackEndSearcher {
         return parts;
     }
 
+    //TODO Add schema here too.
     public void fill(Result result, String summaryClass) {
         if (result.isFilled(summaryClass)) return; // TODO: Checked in the superclass - remove