Remove (SearchResult|DocumentSummary)(Command|Reply) storage and documentapi messages.

44 files changed, 22 insertions, 1047 deletions

diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
index 70dff6730ff..409b807c833 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
@@ -9,9 +9,7 @@ import com.yahoo.documentapi.VisitorDataHandler;
 import com.yahoo.documentapi.VisitorParameters;
 import com.yahoo.documentapi.VisitorSession;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
-import com.yahoo.documentapi.messagebus.protocol.DocumentSummaryMessage;
 import com.yahoo.documentapi.messagebus.protocol.QueryResultMessage;
-import com.yahoo.documentapi.messagebus.protocol.SearchResultMessage;
 import com.yahoo.io.GrowableByteBuffer;
 
 import com.yahoo.messagebus.Message;
@@ -300,12 +298,8 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
     public void onMessage(Message m, AckToken token) {
         if (m instanceof QueryResultMessage qm) {
             onQueryResult(qm.getResult(), qm.getSummary());
-        } else if (m instanceof SearchResultMessage) {
-            onSearchResult(((SearchResultMessage) m).getResult());
-        } else if (m instanceof DocumentSummaryMessage dsm) {
-            onDocumentSummary(dsm.getResult());
         } else {
-            throw new UnsupportedOperationException("Received unsupported message " + m + ". VdsVisitor can only accept query result, search result, and documentsummary messages.");
+            throw new UnsupportedOperationException("Received unsupported message " + m + ". VdsVisitor can only accept query result messages.");
         }
         ack(token);
     }
@@ -320,13 +314,6 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
         handleSummary(summary);
     }
 
-    public void onSearchResult(SearchResult sr) {
-        if (log.isLoggable(Level.FINEST)) {
-            log.log(Level.FINEST, "Got SearchResult for query with selection " + params.getDocumentSelection());
-        }
-        handleSearchResult(sr);
-    }
-
     private void handleSearchResult(SearchResult sr) {
         final int hitCountTotal = sr.getTotalHitCount();
         final int hitCount = sr.getHitCount();
@@ -377,13 +364,6 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
         }
     }
 
-    public void onDocumentSummary(DocumentSummary ds) {
-        if (log.isLoggable(Level.FINEST)) {
-            log.log(Level.FINEST, "Got DocumentSummary for query with selection " + params.getDocumentSelection());
-        }
-        handleSummary(ds);
-    }
-
     private void handleSummary(DocumentSummary ds) {
         int summaryCount = ds.getSummaryCount();
         if (log.isLoggable(Level.FINE)) {
diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java
index 0e3ecf1c8cc..28a34ff2f6d 100644
--- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java
+++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java
@@ -5,9 +5,7 @@ import com.yahoo.document.fieldset.AllFields;
 import com.yahoo.document.select.parser.ParseException;
 import com.yahoo.documentapi.*;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
-import com.yahoo.documentapi.messagebus.protocol.DocumentSummaryMessage;
 import com.yahoo.documentapi.messagebus.protocol.QueryResultMessage;
-import com.yahoo.documentapi.messagebus.protocol.SearchResultMessage;
 import com.yahoo.messagebus.Message;
 import com.yahoo.messagebus.Trace;
 import com.yahoo.messagebus.routing.Route;
@@ -63,18 +61,6 @@ public class VdsVisitorTestCase {
         return qrm;
     }
 
-    private SearchResultMessage createSRM(String docId, double rank) {
-        SearchResultMessage srm = new SearchResultMessage();
-        srm.setSearchResult(createSR(docId, rank));
-        return srm;
-    }
-
-    private DocumentSummaryMessage createDSM(String docId) {
-        DocumentSummaryMessage dsm = new DocumentSummaryMessage();
-        dsm.setDocumentSummary(createDS(docId));
-        return dsm;
-    }
-
     private Message createM() {
         return new Message() {
             @Override
@@ -357,15 +343,13 @@ public class VdsVisitorTestCase {
     private void supplyResults(VdsVisitor visitor) {
         AckToken ackToken = null;
         visitor.onMessage(createQRM("id:ns:type::0", 0.3), ackToken);
-        visitor.onMessage(createSRM("id:ns:type::1", 1.0), ackToken);
-        visitor.onMessage(createSRM("id:ns:type::2", 0.5), ackToken);
-        visitor.onMessage(createDSM("id:ns:type::1"), ackToken);
-        visitor.onMessage(createDSM("id:ns:type::2"), ackToken);
+        visitor.onMessage(createQRM("id:ns:type::1", 1.0), ackToken);
+        visitor.onMessage(createQRM("id:ns:type::2", 0.5), ackToken);
         try {
             visitor.onMessage(createM(), ackToken);
             assertTrue(false, "Unsupported message did not cause exception");
         } catch (UnsupportedOperationException uoe) {
-            assertTrue(uoe.getMessage().contains("VdsVisitor can only accept query result, search result, and documentsummary messages"));
+            assertTrue(uoe.getMessage().contains("VdsVisitor can only accept query result messages"));
         }
     }
 
diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json
index dbea284e39e..7662258037c 100644
--- a/documentapi/abi-spec.json
+++ b/documentapi/abi-spec.json
@@ -1828,8 +1828,6 @@
       "public static final int MESSAGE_CREATEVISITOR",
       "public static final int MESSAGE_DESTROYVISITOR",
       "public static final int MESSAGE_VISITORINFO",
-      "public static final int MESSAGE_SEARCHRESULT",
-      "public static final int MESSAGE_DOCUMENTSUMMARY",
       "public static final int MESSAGE_MAPVISITOR",
       "public static final int MESSAGE_GETBUCKETSTATE",
       "public static final int MESSAGE_STATBUCKET",
@@ -1846,8 +1844,6 @@
       "public static final int REPLY_CREATEVISITOR",
       "public static final int REPLY_DESTROYVISITOR",
       "public static final int REPLY_VISITORINFO",
-      "public static final int REPLY_SEARCHRESULT",
-      "public static final int REPLY_DOCUMENTSUMMARY",
       "public static final int REPLY_MAPVISITOR",
       "public static final int REPLY_GETBUCKETSTATE",
       "public static final int REPLY_STATBUCKET",
@@ -2093,21 +2089,6 @@
     ],
     "fields" : [ ]
   },
-  "com.yahoo.documentapi.messagebus.protocol.DocumentSummaryMessage" : {
-    "superClass" : "com.yahoo.documentapi.messagebus.protocol.VisitorMessage",
-    "interfaces" : [ ],
-    "attributes" : [
-      "public"
-    ],
-    "methods" : [
-      "public void <init>()",
-      "public void setDocumentSummary(com.yahoo.vdslib.DocumentSummary)",
-      "public com.yahoo.vdslib.DocumentSummary getResult()",
-      "public com.yahoo.documentapi.messagebus.protocol.DocumentReply createReply()",
-      "public int getType()"
-    ],
-    "fields" : [ ]
-  },
   "com.yahoo.documentapi.messagebus.protocol.DocumentrouteselectorpolicyConfig$Builder" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [
@@ -2459,8 +2440,8 @@
       "public int getType()",
       "public com.yahoo.document.TestAndSetCondition getCondition()",
       "public void setCondition(com.yahoo.document.TestAndSetCondition)",
-      "public boolean getCreateIfNonExistent()",
-      "public void setCreateIfNonExistent(boolean)"
+      "public void setCreateIfNonExistent(boolean)",
+      "public boolean getCreateIfNonExistent()"
     ],
     "fields" : [ ]
   },
@@ -2672,32 +2653,6 @@
     ],
     "fields" : [ ]
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentSummaryMessageFactory" : {
-    "superClass" : "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
-    "interfaces" : [ ],
-    "attributes" : [
-      "public"
-    ],
-    "methods" : [
-      "public void <init>()",
-      "protected com.yahoo.documentapi.messagebus.protocol.DocumentMessage doDecode(com.yahoo.document.serialization.DocumentDeserializer)",
-      "protected boolean doEncode(com.yahoo.documentapi.messagebus.protocol.DocumentMessage, com.yahoo.document.serialization.DocumentSerializer)"
-    ],
-    "fields" : [ ]
-  },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentSummaryReplyFactory" : {
-    "superClass" : "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
-    "interfaces" : [ ],
-    "attributes" : [
-      "public"
-    ],
-    "methods" : [
-      "public void <init>()",
-      "protected com.yahoo.documentapi.messagebus.protocol.DocumentReply doDecode(com.yahoo.document.serialization.DocumentDeserializer)",
-      "protected boolean doEncode(com.yahoo.documentapi.messagebus.protocol.DocumentReply, com.yahoo.document.serialization.DocumentSerializer)"
-    ],
-    "fields" : [ ]
-  },
   "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$EmptyBucketsMessageFactory" : {
     "superClass" : "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces" : [ ],
@@ -2936,32 +2891,6 @@
     ],
     "fields" : [ ]
   },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$SearchResultMessageFactory" : {
-    "superClass" : "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
-    "interfaces" : [ ],
-    "attributes" : [
-      "public"
-    ],
-    "methods" : [
-      "public void <init>()",
-      "protected com.yahoo.documentapi.messagebus.protocol.DocumentMessage doDecode(com.yahoo.document.serialization.DocumentDeserializer)",
-      "protected boolean doEncode(com.yahoo.documentapi.messagebus.protocol.DocumentMessage, com.yahoo.document.serialization.DocumentSerializer)"
-    ],
-    "fields" : [ ]
-  },
-  "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$SearchResultReplyFactory" : {
-    "superClass" : "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentReplyFactory",
-    "interfaces" : [ ],
-    "attributes" : [
-      "public"
-    ],
-    "methods" : [
-      "public void <init>()",
-      "protected com.yahoo.documentapi.messagebus.protocol.DocumentReply doDecode(com.yahoo.document.serialization.DocumentDeserializer)",
-      "protected boolean doEncode(com.yahoo.documentapi.messagebus.protocol.DocumentReply, com.yahoo.document.serialization.DocumentSerializer)"
-    ],
-    "fields" : [ ]
-  },
   "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$StatBucketMessageFactory" : {
     "superClass" : "com.yahoo.documentapi.messagebus.protocol.RoutableFactories60$DocumentMessageFactory",
     "interfaces" : [ ],
@@ -3095,21 +3024,6 @@
     ],
     "fields" : [ ]
   },
-  "com.yahoo.documentapi.messagebus.protocol.SearchResultMessage" : {
-    "superClass" : "com.yahoo.documentapi.messagebus.protocol.VisitorMessage",
-    "interfaces" : [ ],
-    "attributes" : [
-      "public"
-    ],
-    "methods" : [
-      "public void <init>()",
-      "public com.yahoo.vdslib.SearchResult getResult()",
-      "public void setSearchResult(com.yahoo.vdslib.SearchResult)",
-      "public com.yahoo.documentapi.messagebus.protocol.DocumentReply createReply()",
-      "public int getType()"
-    ],
-    "fields" : [ ]
-  },
   "com.yahoo.documentapi.messagebus.protocol.SlobrokPolicy" : {
     "superClass" : "java.lang.Object",
     "interfaces" : [
@@ -3293,4 +3207,4 @@
     ],
     "fields" : [ ]
   }
-}
+}
\ No newline at end of file
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java
index 0ff578b64d7..554e97b38fc 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java
@@ -50,8 +50,8 @@ public class DocumentProtocol implements Protocol {
     public static final int MESSAGE_CREATEVISITOR = DOCUMENT_MESSAGE + 7;
     public static final int MESSAGE_DESTROYVISITOR = DOCUMENT_MESSAGE + 8;
     public static final int MESSAGE_VISITORINFO = DOCUMENT_MESSAGE + 9;
-    public static final int MESSAGE_SEARCHRESULT = DOCUMENT_MESSAGE + 11;
-    public static final int MESSAGE_DOCUMENTSUMMARY = DOCUMENT_MESSAGE + 14;
+    // public static final int MESSAGE_SEARCHRESULT = DOCUMENT_MESSAGE + 11;
+    // public static final int MESSAGE_DOCUMENTSUMMARY = DOCUMENT_MESSAGE + 14;
     public static final int MESSAGE_MAPVISITOR = DOCUMENT_MESSAGE + 15;
     public static final int MESSAGE_GETBUCKETSTATE = DOCUMENT_MESSAGE + 18;
     public static final int MESSAGE_STATBUCKET = DOCUMENT_MESSAGE + 19;
@@ -70,8 +70,8 @@ public class DocumentProtocol implements Protocol {
     public static final int REPLY_CREATEVISITOR = DOCUMENT_REPLY + 7;
     public static final int REPLY_DESTROYVISITOR = DOCUMENT_REPLY + 8;
     public static final int REPLY_VISITORINFO = DOCUMENT_REPLY + 9;
-    public static final int REPLY_SEARCHRESULT = DOCUMENT_REPLY + 11;
-    public static final int REPLY_DOCUMENTSUMMARY = DOCUMENT_REPLY + 14;
+    // public static final int REPLY_SEARCHRESULT = DOCUMENT_REPLY + 11;
+    // public static final int REPLY_DOCUMENTSUMMARY = DOCUMENT_REPLY + 14;
     public static final int REPLY_MAPVISITOR = DOCUMENT_REPLY + 15;
     public static final int REPLY_GETBUCKETSTATE = DOCUMENT_REPLY + 18;
     public static final int REPLY_STATBUCKET = DOCUMENT_REPLY + 19;
@@ -282,7 +282,6 @@ public class DocumentProtocol implements Protocol {
         putRoutableFactory(MESSAGE_CREATEVISITOR, new RoutableFactories60.CreateVisitorMessageFactory(), from6);
         putRoutableFactory(MESSAGE_DESTROYVISITOR, new RoutableFactories60.DestroyVisitorMessageFactory(), from6);
         putRoutableFactory(MESSAGE_DOCUMENTLIST, new RoutableFactories60.DocumentListMessageFactory(), from6);
-        putRoutableFactory(MESSAGE_DOCUMENTSUMMARY, new RoutableFactories60.DocumentSummaryMessageFactory(), from6);
         putRoutableFactory(MESSAGE_EMPTYBUCKETS, new RoutableFactories60.EmptyBucketsMessageFactory(), from6);
         putRoutableFactory(MESSAGE_GETBUCKETLIST, new RoutableFactories60.GetBucketListMessageFactory(), from6);
         putRoutableFactory(MESSAGE_GETBUCKETSTATE, new RoutableFactories60.GetBucketStateMessageFactory(), from6);
@@ -292,7 +291,6 @@ public class DocumentProtocol implements Protocol {
         putRoutableFactory(MESSAGE_QUERYRESULT, new RoutableFactories60.QueryResultMessageFactory(), from6);
         putRoutableFactory(MESSAGE_REMOVEDOCUMENT, new RoutableFactories60.RemoveDocumentMessageFactory(), from6);
         putRoutableFactory(MESSAGE_REMOVELOCATION, new RoutableFactories60.RemoveLocationMessageFactory(), from6);
-        putRoutableFactory(MESSAGE_SEARCHRESULT, new RoutableFactories60.SearchResultMessageFactory(), from6);
         putRoutableFactory(MESSAGE_STATBUCKET, new RoutableFactories60.StatBucketMessageFactory(), from6);
         putRoutableFactory(MESSAGE_UPDATEDOCUMENT, new RoutableFactories60.UpdateDocumentMessageFactory(), from6);
         putRoutableFactory(MESSAGE_VISITORINFO, new RoutableFactories60.VisitorInfoMessageFactory(), from6);
@@ -300,7 +298,6 @@ public class DocumentProtocol implements Protocol {
         putRoutableFactory(REPLY_DESTROYVISITOR, new RoutableFactories60.DestroyVisitorReplyFactory(), from6);
         putRoutableFactory(REPLY_DOCUMENTIGNORED, new RoutableFactories60.DocumentIgnoredReplyFactory(), from6);
         putRoutableFactory(REPLY_DOCUMENTLIST, new RoutableFactories60.DocumentListReplyFactory(), from6);
-        putRoutableFactory(REPLY_DOCUMENTSUMMARY, new RoutableFactories60.DocumentSummaryReplyFactory(), from6);
         putRoutableFactory(REPLY_EMPTYBUCKETS, new RoutableFactories60.EmptyBucketsReplyFactory(), from6);
         putRoutableFactory(REPLY_GETBUCKETLIST, new RoutableFactories60.GetBucketListReplyFactory(), from6);
         putRoutableFactory(REPLY_GETBUCKETSTATE, new RoutableFactories60.GetBucketStateReplyFactory(), from6);
@@ -310,7 +307,6 @@ public class DocumentProtocol implements Protocol {
         putRoutableFactory(REPLY_QUERYRESULT, new RoutableFactories60.QueryResultReplyFactory(), from6);
         putRoutableFactory(REPLY_REMOVEDOCUMENT, new RoutableFactories60.RemoveDocumentReplyFactory(), from6);
         putRoutableFactory(REPLY_REMOVELOCATION, new RoutableFactories60.RemoveLocationReplyFactory(), from6);
-        putRoutableFactory(REPLY_SEARCHRESULT, new RoutableFactories60.SearchResultReplyFactory(), from6);
         putRoutableFactory(REPLY_STATBUCKET, new RoutableFactories60.StatBucketReplyFactory(), from6);
         putRoutableFactory(REPLY_UPDATEDOCUMENT, new RoutableFactories60.UpdateDocumentReplyFactory(), from6);
         putRoutableFactory(REPLY_UPDATEDOCUMENT, new RoutableFactories60.UpdateDocumentReplyFactory(), from6);
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentSummaryMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentSummaryMessage.java
deleted file mode 100644
index 4866579a977..00000000000
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentSummaryMessage.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.documentapi.messagebus.protocol;
-
-import com.yahoo.vdslib.DocumentSummary;
-
-public class DocumentSummaryMessage extends VisitorMessage {
-
-    private DocumentSummary documentSummary = null;
-
-    public void setDocumentSummary(DocumentSummary summary) {
-        documentSummary = summary;
-    }
-
-    public DocumentSummary getResult() {
-        return documentSummary;
-    }
-
-    @Override
-    public DocumentReply createReply() {
-        return new VisitorReply(DocumentProtocol.REPLY_DOCUMENTSUMMARY);
-    }
-
-    @Override
-    public int getType() {
-        return DocumentProtocol.MESSAGE_DOCUMENTSUMMARY;
-    }
-}
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java
index 9812f214066..3824da32d4e 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java
@@ -344,34 +344,6 @@ public abstract class RoutableFactories60 {
         }
     }
 
-    public static class DocumentSummaryMessageFactory extends DocumentMessageFactory {
-
-        @Override
-        protected DocumentMessage doDecode(DocumentDeserializer buf) {
-            DocumentSummaryMessage msg = new DocumentSummaryMessage();
-            msg.setDocumentSummary(new DocumentSummary(buf));
-            return msg;
-        }
-
-        @Override
-        protected boolean doEncode(DocumentMessage obj, DocumentSerializer buf) {
-            return false; // not supported
-        }
-    }
-
-    public static class DocumentSummaryReplyFactory extends DocumentReplyFactory {
-
-        @Override
-        protected DocumentReply doDecode(DocumentDeserializer buf) {
-            return new VisitorReply(DocumentProtocol.REPLY_DOCUMENTSUMMARY);
-        }
-
-        @Override
-        protected boolean doEncode(DocumentReply obj, DocumentSerializer buf) {
-            return true;
-        }
-    }
-
     public static class EmptyBucketsMessageFactory extends DocumentMessageFactory {
 
         @Override
@@ -728,21 +700,6 @@ public abstract class RoutableFactories60 {
         }
     }
 
-    public static class SearchResultMessageFactory extends DocumentMessageFactory {
-
-        @Override
-        protected DocumentMessage doDecode(DocumentDeserializer buf) {
-            SearchResultMessage msg = new SearchResultMessage();
-            msg.setSearchResult(new SearchResult(buf));
-            return msg;
-        }
-
-        @Override
-        protected boolean doEncode(DocumentMessage obj, DocumentSerializer buf) {
-            return false; // not supported
-        }
-    }
-
     public static class QueryResultMessageFactory extends DocumentMessageFactory {
 
         @Override
@@ -759,19 +716,6 @@ public abstract class RoutableFactories60 {
         }
     }
 
-    public static class SearchResultReplyFactory extends DocumentReplyFactory {
-
-        @Override
-        protected DocumentReply doDecode(DocumentDeserializer buf) {
-            return new VisitorReply(DocumentProtocol.REPLY_SEARCHRESULT);
-        }
-
-        @Override
-        protected boolean doEncode(DocumentReply obj, DocumentSerializer buf) {
-            return true;
-        }
-    }
-
     public static class QueryResultReplyFactory extends DocumentReplyFactory {
 
         @Override
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SearchResultMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SearchResultMessage.java
deleted file mode 100644
index 570aafd49e6..00000000000
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/SearchResultMessage.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.documentapi.messagebus.protocol;
-
-import com.yahoo.vdslib.SearchResult;
-
-public class SearchResultMessage extends VisitorMessage {
-
-    private SearchResult searchResult = null;
-
-    public SearchResult getResult() {
-        return searchResult;
-    }
-
-    public void setSearchResult(SearchResult result) {
-        searchResult = result;
-    }
-
-    @Override
-    public DocumentReply createReply() {
-        return new VisitorReply(DocumentProtocol.REPLY_SEARCHRESULT);
-    }
-
-    @Override
-    public int getType() {
-        return DocumentProtocol.MESSAGE_SEARCHRESULT;
-    }
-}
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
index 97cef53695a..22650fcdbf8 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
@@ -20,7 +20,6 @@ import com.yahoo.documentapi.messagebus.protocol.DocumentListMessage;
 import com.yahoo.documentapi.messagebus.protocol.DocumentProtocol;
 import com.yahoo.documentapi.messagebus.protocol.DocumentReply;
 import com.yahoo.documentapi.messagebus.protocol.DocumentState;
-import com.yahoo.documentapi.messagebus.protocol.DocumentSummaryMessage;
 import com.yahoo.documentapi.messagebus.protocol.EmptyBucketsMessage;
 import com.yahoo.documentapi.messagebus.protocol.GetBucketListMessage;
 import com.yahoo.documentapi.messagebus.protocol.GetBucketListReply;
@@ -34,7 +33,6 @@ import com.yahoo.documentapi.messagebus.protocol.QueryResultMessage;
 import com.yahoo.documentapi.messagebus.protocol.RemoveDocumentMessage;
 import com.yahoo.documentapi.messagebus.protocol.RemoveDocumentReply;
 import com.yahoo.documentapi.messagebus.protocol.RemoveLocationMessage;
-import com.yahoo.documentapi.messagebus.protocol.SearchResultMessage;
 import com.yahoo.documentapi.messagebus.protocol.StatBucketMessage;
 import com.yahoo.documentapi.messagebus.protocol.StatBucketReply;
 import com.yahoo.documentapi.messagebus.protocol.UpdateDocumentMessage;
@@ -69,7 +67,6 @@ public class Messages60TestCase extends MessagesTestBase {
         out.put(DocumentProtocol.MESSAGE_CREATEVISITOR, new testCreateVisitorMessage());
         out.put(DocumentProtocol.MESSAGE_DESTROYVISITOR, new testDestroyVisitorMessage());
         out.put(DocumentProtocol.MESSAGE_DOCUMENTLIST, new testDocumentListMessage());
-        out.put(DocumentProtocol.MESSAGE_DOCUMENTSUMMARY, new testDocumentSummaryMessage());
         out.put(DocumentProtocol.MESSAGE_EMPTYBUCKETS, new testEmptyBucketsMessage());
         out.put(DocumentProtocol.MESSAGE_GETBUCKETLIST, new testGetBucketListMessage());
         out.put(DocumentProtocol.MESSAGE_GETBUCKETSTATE, new testGetBucketStateMessage());
@@ -79,7 +76,6 @@ public class Messages60TestCase extends MessagesTestBase {
         out.put(DocumentProtocol.MESSAGE_QUERYRESULT, new testQueryResultMessage());
         out.put(DocumentProtocol.MESSAGE_REMOVEDOCUMENT, new testRemoveDocumentMessage());
         out.put(DocumentProtocol.MESSAGE_REMOVELOCATION, new testRemoveLocationMessage());
-        out.put(DocumentProtocol.MESSAGE_SEARCHRESULT, new testSearchResultMessage());
         out.put(DocumentProtocol.MESSAGE_STATBUCKET, new testStatBucketMessage());
         out.put(DocumentProtocol.MESSAGE_UPDATEDOCUMENT, new testUpdateDocumentMessage());
         out.put(DocumentProtocol.MESSAGE_VISITORINFO, new testVisitorInfoMessage());
@@ -87,7 +83,6 @@ public class Messages60TestCase extends MessagesTestBase {
         out.put(DocumentProtocol.REPLY_DESTROYVISITOR, new testDestroyVisitorReply());
         out.put(DocumentProtocol.REPLY_DOCUMENTIGNORED, new testDocumentIgnoredReply());
         out.put(DocumentProtocol.REPLY_DOCUMENTLIST, new testDocumentListReply());
-        out.put(DocumentProtocol.REPLY_DOCUMENTSUMMARY, new testDocumentSummaryReply());
         out.put(DocumentProtocol.REPLY_EMPTYBUCKETS, new testEmptyBucketsReply());
         out.put(DocumentProtocol.REPLY_GETBUCKETLIST, new testGetBucketListReply());
         out.put(DocumentProtocol.REPLY_GETBUCKETSTATE, new testGetBucketStateReply());
@@ -97,7 +92,6 @@ public class Messages60TestCase extends MessagesTestBase {
         out.put(DocumentProtocol.REPLY_QUERYRESULT, new testQueryResultReply());
         out.put(DocumentProtocol.REPLY_REMOVEDOCUMENT, new testRemoveDocumentReply());
         out.put(DocumentProtocol.REPLY_REMOVELOCATION, new testRemoveLocationReply());
-        out.put(DocumentProtocol.REPLY_SEARCHRESULT, new testSearchResultReply());
         out.put(DocumentProtocol.REPLY_STATBUCKET, new testStatBucketReply());
         out.put(DocumentProtocol.REPLY_UPDATEDOCUMENT, new testUpdateDocumentReply());
         out.put(DocumentProtocol.REPLY_VISITORINFO, new testVisitorInfoReply());
@@ -324,14 +318,6 @@ public class Messages60TestCase extends MessagesTestBase {
         }
     }
 
-    public class testDocumentSummaryReply implements RunnableTest {
-
-        @Override
-        public void run() {
-            testVisitorReply("DocumentSummaryReply", DocumentProtocol.REPLY_DOCUMENTSUMMARY);
-        }
-    }
-
     public class testEmptyBucketsReply implements RunnableTest {
 
         @Override
@@ -392,65 +378,6 @@ public class Messages60TestCase extends MessagesTestBase {
         }
     }
 
-    public class testDocumentSummaryMessage implements RunnableTest {
-
-        @Override
-        public void run() {
-            Routable routable = deserialize("DocumentSummaryMessage-1", DocumentProtocol.MESSAGE_DOCUMENTSUMMARY, Language.CPP);
-            assertTrue(routable instanceof DocumentSummaryMessage);
-
-            DocumentSummaryMessage msg = (DocumentSummaryMessage) routable;
-            assertEquals(0, msg.getResult().getSummaryCount());
-
-            routable = deserialize("DocumentSummaryMessage-2", DocumentProtocol.MESSAGE_DOCUMENTSUMMARY, Language.CPP);
-            assertTrue(routable instanceof DocumentSummaryMessage);
-
-            msg = (DocumentSummaryMessage) routable;
-            assertEquals(2, msg.getResult().getSummaryCount());
-            com.yahoo.vdslib.DocumentSummary.Summary s = msg.getResult().getSummary(0);
-            assertEquals("doc1", s.getDocId());
-            byte[] b = s.getSummary();
-            assertEquals(8, b.length);
-            byte[] c = {'s', 'u', 'm', 'm', 'a', 'r', 'y', '1'};
-            for (int i = 0; i < b.length; i++) {
-                assertEquals(c[i], b[i]);
-            }
-
-            s = msg.getResult().getSummary(1);
-            assertEquals("aoc17", s.getDocId());
-            b = s.getSummary();
-            assertEquals(9, b.length);
-            byte[] d = {'s', 'u', 'm', 'm', 'a', 'r', 'y', '4', '5'};
-            for (int i = 0; i < b.length; i++) {
-                assertEquals(d[i], b[i]);
-            }
-            routable = deserialize("DocumentSummaryMessage-3", DocumentProtocol.MESSAGE_DOCUMENTSUMMARY, Language.CPP);
-            assertTrue(routable instanceof DocumentSummaryMessage);
-
-            msg = (DocumentSummaryMessage) routable;
-            assertEquals(2, msg.getResult().getSummaryCount());
-
-            s = msg.getResult().getSummary(0);
-            assertEquals("aoc17", s.getDocId());
-            b = s.getSummary();
-            assertEquals(9, b.length);
-            byte[] e = {'s', 'u', 'm', 'm', 'a', 'r', 'y', '4', '5'};
-            for (int i = 0; i < b.length; i++) {
-                assertEquals(e[i], b[i]);
-            }
-
-            s = msg.getResult().getSummary(1);
-            assertEquals("doc1", s.getDocId());
-            b = s.getSummary();
-            assertEquals(8, b.length);
-            byte[] f = {'s', 'u', 'm', 'm', 'a', 'r', 'y', '1'};
-            for (int i = 0; i < b.length; i++) {
-                assertEquals(f[i], b[i]);
-            }
-        }
-    }
-
-
     public class testGetDocumentMessage implements RunnableTest {
 
         @Override
@@ -521,78 +448,6 @@ public class Messages60TestCase extends MessagesTestBase {
         }
     }
 
-    public class testSearchResultMessage implements RunnableTest {
-
-        @Override
-        public void run() throws Exception {
-            Routable routable = deserialize("SearchResultMessage-1", DocumentProtocol.MESSAGE_SEARCHRESULT, Language.CPP);
-            assertTrue(routable instanceof SearchResultMessage);
-
-            SearchResultMessage msg = (SearchResultMessage)routable;
-            assertEquals(0, msg.getResult().getHitCount());
-
-            routable = deserialize("SearchResultMessage-2", DocumentProtocol.MESSAGE_SEARCHRESULT, Language.CPP);
-            assertTrue(routable instanceof SearchResultMessage);
-
-            msg = (SearchResultMessage)routable;
-            assertEquals(2, msg.getResult().getHitCount());
-            com.yahoo.vdslib.SearchResult.Hit h = msg.getResult().getHit(0);
-            assertEquals(89.0, h.getRank(), 1E-6);
-            assertEquals("doc1", h.getDocId());
-            h = msg.getResult().getHit(1);
-            assertEquals(109.0, h.getRank(), 1E-6);
-            assertEquals("doc17", h.getDocId());
-
-            routable = deserialize("SearchResultMessage-3", DocumentProtocol.MESSAGE_SEARCHRESULT, Language.CPP);
-            assertTrue(routable instanceof SearchResultMessage);
-
-            msg = (SearchResultMessage)routable;
-            assertEquals(2, msg.getResult().getHitCount());
-            h = msg.getResult().getHit(0);
-            assertEquals(109.0, h.getRank(), 1E-6);
-            assertEquals("doc17", h.getDocId());
-            h = msg.getResult().getHit(1);
-            assertEquals(89.0, h.getRank(), 1E-6);
-            assertEquals("doc1", h.getDocId());
-
-            routable = deserialize("SearchResultMessage-4", DocumentProtocol.MESSAGE_SEARCHRESULT, Language.CPP);
-            assertTrue(routable instanceof SearchResultMessage);
-
-            msg = (SearchResultMessage)routable;
-            assertEquals(3, msg.getResult().getHitCount());
-            h = msg.getResult().getHit(0);
-            assertTrue(h instanceof SearchResult.HitWithSortBlob);
-            assertEquals(89.0, h.getRank(), 1E-6);
-            assertEquals("doc1", h.getDocId());
-            byte[] b = ((SearchResult.HitWithSortBlob)h).getSortBlob();
-            assertEquals(9, b.length);
-            byte[] e = { 's', 'o', 'r', 't', 'd', 'a', 't', 'a', '2' };
-            for (int i = 0; i < b.length; i++) {
-                assertEquals(e[i], b[i]);
-            }
-            h = msg.getResult().getHit(1);
-            assertTrue(h instanceof SearchResult.HitWithSortBlob);
-            assertEquals(109.0, h.getRank(), 1E-6);
-            assertEquals("doc17", h.getDocId());
-            b = ((SearchResult.HitWithSortBlob)h).getSortBlob();
-            assertEquals(9, b.length);
-            byte[] d = { 's', 'o', 'r', 't', 'd', 'a', 't', 'a', '1' };
-            for (int i = 0; i < b.length; i++) {
-                assertEquals(d[i], b[i]);
-            }
-            h = msg.getResult().getHit(2);
-            assertTrue(h instanceof SearchResult.HitWithSortBlob);
-            assertEquals(90.0, h.getRank(), 1E-6);
-            assertEquals("doc18", h.getDocId());
-            b = ((SearchResult.HitWithSortBlob)h).getSortBlob();
-            assertEquals(9, b.length);
-            byte[] c = { 's', 'o', 'r', 't', 'd', 'a', 't', 'a', '3' };
-            for (int i = 0; i < b.length; i++) {
-                assertEquals(c[i], b[i]);
-            }
-        }
-    }
-
     private static String CONDITION_STRING = "There's just one condition";
 
     public class testPutDocumentMessage implements RunnableTest {
@@ -750,14 +605,6 @@ public class Messages60TestCase extends MessagesTestBase {
         }
     }
 
-    public class testSearchResultReply implements RunnableTest {
-
-        @Override
-        public void run() {
-            testVisitorReply("SearchResultReply", DocumentProtocol.REPLY_SEARCHRESULT);
-        }
-    }
-
     public class testStatBucketReply implements RunnableTest {
 
         @Override
diff --git a/documentapi/src/tests/messages/messages60test.cpp b/documentapi/src/tests/messages/messages60test.cpp
index 93c7b5ef7cb..12cecefb072 100644
--- a/documentapi/src/tests/messages/messages60test.cpp
+++ b/documentapi/src/tests/messages/messages60test.cpp
@@ -39,7 +39,6 @@ Messages60Test::Messages60Test()
     putTest(DocumentProtocol::MESSAGE_CREATEVISITOR, TEST_METHOD(Messages60Test::testCreateVisitorMessage));
     putTest(DocumentProtocol::MESSAGE_DESTROYVISITOR, TEST_METHOD(Messages60Test::testDestroyVisitorMessage));
     putTest(DocumentProtocol::MESSAGE_DOCUMENTLIST, TEST_METHOD(Messages60Test::testDocumentListMessage));
-    putTest(DocumentProtocol::MESSAGE_DOCUMENTSUMMARY, TEST_METHOD(Messages60Test::testDocumentSummaryMessage));
     putTest(DocumentProtocol::MESSAGE_EMPTYBUCKETS, TEST_METHOD(Messages60Test::testEmptyBucketsMessage));
     putTest(DocumentProtocol::MESSAGE_GETBUCKETLIST, TEST_METHOD(Messages60Test::testGetBucketListMessage));
     putTest(DocumentProtocol::MESSAGE_GETBUCKETSTATE, TEST_METHOD(Messages60Test::testGetBucketStateMessage));
@@ -49,7 +48,6 @@ Messages60Test::Messages60Test()
     putTest(DocumentProtocol::MESSAGE_QUERYRESULT, TEST_METHOD(Messages60Test::testQueryResultMessage));
     putTest(DocumentProtocol::MESSAGE_REMOVEDOCUMENT, TEST_METHOD(Messages60Test::testRemoveDocumentMessage));
     putTest(DocumentProtocol::MESSAGE_REMOVELOCATION, TEST_METHOD(Messages60Test::testRemoveLocationMessage));
-    putTest(DocumentProtocol::MESSAGE_SEARCHRESULT, TEST_METHOD(Messages60Test::testSearchResultMessage));
     putTest(DocumentProtocol::MESSAGE_STATBUCKET, TEST_METHOD(Messages60Test::testStatBucketMessage));
     putTest(DocumentProtocol::MESSAGE_UPDATEDOCUMENT, TEST_METHOD(Messages60Test::testUpdateDocumentMessage));
     putTest(DocumentProtocol::MESSAGE_VISITORINFO, TEST_METHOD(Messages60Test::testVisitorInfoMessage));
@@ -58,7 +56,6 @@ Messages60Test::Messages60Test()
     putTest(DocumentProtocol::REPLY_DESTROYVISITOR, TEST_METHOD(Messages60Test::testDestroyVisitorReply));
     putTest(DocumentProtocol::REPLY_DOCUMENTIGNORED, TEST_METHOD(Messages60Test::testDocumentIgnoredReply));
     putTest(DocumentProtocol::REPLY_DOCUMENTLIST, TEST_METHOD(Messages60Test::testDocumentListReply));
-    putTest(DocumentProtocol::REPLY_DOCUMENTSUMMARY, TEST_METHOD(Messages60Test::testDocumentSummaryReply));
     putTest(DocumentProtocol::REPLY_EMPTYBUCKETS, TEST_METHOD(Messages60Test::testEmptyBucketsReply));
     putTest(DocumentProtocol::REPLY_GETBUCKETLIST, TEST_METHOD(Messages60Test::testGetBucketListReply));
     putTest(DocumentProtocol::REPLY_GETBUCKETSTATE, TEST_METHOD(Messages60Test::testGetBucketStateReply));
@@ -68,7 +65,6 @@ Messages60Test::Messages60Test()
     putTest(DocumentProtocol::REPLY_QUERYRESULT, TEST_METHOD(Messages60Test::testQueryResultReply));
     putTest(DocumentProtocol::REPLY_REMOVEDOCUMENT, TEST_METHOD(Messages60Test::testRemoveDocumentReply));
     putTest(DocumentProtocol::REPLY_REMOVELOCATION, TEST_METHOD(Messages60Test::testRemoveLocationReply));
-    putTest(DocumentProtocol::REPLY_SEARCHRESULT, TEST_METHOD(Messages60Test::testSearchResultReply));
     putTest(DocumentProtocol::REPLY_STATBUCKET, TEST_METHOD(Messages60Test::testStatBucketReply));
     putTest(DocumentProtocol::REPLY_UPDATEDOCUMENT, TEST_METHOD(Messages60Test::testUpdateDocumentReply));
     putTest(DocumentProtocol::REPLY_VISITORINFO, TEST_METHOD(Messages60Test::testVisitorInfoReply));
@@ -269,65 +265,6 @@ Messages60Test::testRemoveLocationMessage()
 
 
 bool
-Messages60Test::testDocumentSummaryMessage()
-{
-    DocumentSummaryMessage srm;
-    EXPECT_EQUAL(srm.hasSequenceId(), false);
-    EXPECT_EQUAL(srm.getSummaryCount(), size_t(0));
-
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + size_t(12), serialize("DocumentSummaryMessage-1", srm));
-
-    mbus::Routable::UP routable = deserialize("DocumentSummaryMessage-1", DocumentProtocol::MESSAGE_DOCUMENTSUMMARY, LANG_CPP);
-    if (!EXPECT_TRUE(routable)) {
-        return false;
-    }
-    DocumentSummaryMessage * dm = static_cast<DocumentSummaryMessage *>(routable.get());
-    EXPECT_EQUAL(dm->getSummaryCount(), size_t(0));
-
-    srm.addSummary("doc1", "summary1", 8);
-    srm.addSummary("aoc17", "summary45", 9);
-
-    const void *summary(NULL);
-    const char *docId(NULL);
-    size_t sz(0);
-
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 52u, serialize("DocumentSummaryMessage-2", srm));
-    routable = deserialize("DocumentSummaryMessage-2", DocumentProtocol::MESSAGE_DOCUMENTSUMMARY, LANG_CPP);
-    if (!EXPECT_TRUE(routable)) {
-        return false;
-    }
-    dm = static_cast<DocumentSummaryMessage *>(routable.get());
-    EXPECT_EQUAL(dm->getSummaryCount(), size_t(2));
-    dm->getSummary(0, docId, summary, sz);
-    EXPECT_EQUAL(sz, 8u);
-    EXPECT_EQUAL(strcmp("doc1", docId), 0);
-    EXPECT_EQUAL(memcmp("summary1", summary, sz), 0);
-    dm->getSummary(1, docId, summary, sz);
-    EXPECT_EQUAL(sz, 9u);
-    EXPECT_EQUAL(strcmp("aoc17", docId), 0);
-    EXPECT_EQUAL(memcmp("summary45", summary, sz), 0);
-
-    srm.sort();
-
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 52u, serialize("DocumentSummaryMessage-3", srm));
-    routable = deserialize("DocumentSummaryMessage-3", DocumentProtocol::MESSAGE_DOCUMENTSUMMARY, LANG_CPP);
-    if (!EXPECT_TRUE(routable)) {
-        return false;
-    }
-    dm = static_cast<DocumentSummaryMessage *>(routable.get());
-    EXPECT_EQUAL(dm->getSummaryCount(), size_t(2));
-    dm->getSummary(0, docId, summary, sz);
-    EXPECT_EQUAL(sz, 9u);
-    EXPECT_EQUAL(strcmp("aoc17", docId), 0);
-    EXPECT_EQUAL(memcmp("summary45", summary, sz), 0);
-    dm->getSummary(1, docId, summary, sz);
-    EXPECT_EQUAL(sz, 8u);
-    EXPECT_EQUAL(strcmp("doc1", docId), 0);
-    EXPECT_EQUAL(memcmp("summary1", summary, sz), 0);
-    return true;
-}
-
-bool
 Messages60Test::testGetDocumentMessage()
 {
     GetDocumentMessage tmp(document::DocumentId("id:ns:testdoc::"), "foo bar");
@@ -561,133 +498,6 @@ Messages60Test::testRemoveDocumentReply()
 }
 
 bool
-Messages60Test::testSearchResultMessage()
-{
-    SearchResultMessage srm;
-    EXPECT_EQUAL(srm.getSequenceId(), 0u);
-    EXPECT_EQUAL(srm.getHitCount(), 0u);
-    EXPECT_EQUAL(srm.getAggregatorList().getSerializedSize(), 4u);
-    EXPECT_EQUAL(srm.vdslib::SearchResult::getSerializedSize(), 20u);
-    EXPECT_EQUAL(srm.getSerializedSize(), 20u);
-
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + size_t(24), serialize("SearchResultMessage-1", srm));
-
-    mbus::Routable::UP routable = deserialize("SearchResultMessage-1", DocumentProtocol::MESSAGE_SEARCHRESULT, LANG_CPP);
-    if (!EXPECT_TRUE(routable)) {
-        return false;
-    }
-    SearchResultMessage * dm = static_cast<SearchResultMessage *>(routable.get());
-    EXPECT_EQUAL(dm->getSequenceId(), size_t(0));
-    EXPECT_EQUAL(dm->getHitCount(), size_t(0));
-
-    srm.addHit(0, "doc1", 89);
-    srm.addHit(1, "doc17", 109);
-
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 55u, serialize("SearchResultMessage-2", srm));
-    routable = deserialize("SearchResultMessage-2", DocumentProtocol::MESSAGE_SEARCHRESULT, LANG_CPP);
-    if (!EXPECT_TRUE(routable)) {
-        return false;
-    }
-    dm = static_cast<SearchResultMessage *>(routable.get());
-    EXPECT_EQUAL(dm->getHitCount(), size_t(2));
-    const char *docId;
-    SearchResultMessage::RankType rank;
-    dm->getHit(0, docId, rank);
-    EXPECT_EQUAL(rank, SearchResultMessage::RankType(89));
-    EXPECT_EQUAL(strcmp("doc1", docId), 0);
-    dm->getHit(1, docId, rank);
-    EXPECT_EQUAL(rank, SearchResultMessage::RankType(109));
-    EXPECT_EQUAL(strcmp("doc17", docId), 0);
-
-    srm.sort();
-
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 55u, serialize("SearchResultMessage-3", srm));
-    routable = deserialize("SearchResultMessage-3", DocumentProtocol::MESSAGE_SEARCHRESULT, LANG_CPP);
-    if (!EXPECT_TRUE(routable)) {
-        return false;
-    }
-    dm = static_cast<SearchResultMessage *>(routable.get());
-    EXPECT_EQUAL(dm->getHitCount(), size_t(2));
-    dm->getHit(0, docId, rank);
-    EXPECT_EQUAL(rank, SearchResultMessage::RankType(109));
-    EXPECT_EQUAL(strcmp("doc17", docId), 0);
-    dm->getHit(1, docId, rank);
-    EXPECT_EQUAL(rank, SearchResultMessage::RankType(89));
-    EXPECT_EQUAL(strcmp("doc1", docId), 0);
-
-    SearchResultMessage srm2;
-    srm2.addHit(0, "doc1", 89, "sortdata2", 9);
-    srm2.addHit(1, "doc17", 109, "sortdata1", 9);
-    srm2.addHit(2, "doc18", 90, "sortdata3", 9);
-
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 108u, serialize("SearchResultMessage-4", srm2));
-    routable = deserialize("SearchResultMessage-4", DocumentProtocol::MESSAGE_SEARCHRESULT, LANG_CPP);
-    if (!EXPECT_TRUE(routable)) {
-        return false;
-    }
-    dm = static_cast<SearchResultMessage *>(routable.get());
-    EXPECT_EQUAL(dm->getHitCount(), size_t(3));
-    dm->getHit(0, docId, rank);
-    EXPECT_EQUAL(rank, SearchResultMessage::RankType(89));
-    EXPECT_EQUAL(strcmp("doc1", docId), 0);
-    dm->getHit(1, docId, rank);
-    EXPECT_EQUAL(rank, SearchResultMessage::RankType(109));
-    EXPECT_EQUAL(strcmp("doc17", docId), 0);
-    dm->getHit(2, docId, rank);
-    EXPECT_EQUAL(rank, SearchResultMessage::RankType(90));
-    EXPECT_EQUAL(strcmp("doc18", docId), 0);
-
-    srm2.sort();
-    const void *buf;
-    size_t sz;
-    srm2.getHit(0, docId, rank);
-    srm2.getSortBlob(0, buf, sz);
-    EXPECT_EQUAL(sz, 9u);
-    EXPECT_EQUAL(memcmp("sortdata1", buf, sz), 0);
-    EXPECT_EQUAL(rank, SearchResultMessage::RankType(109));
-    EXPECT_EQUAL(strcmp("doc17", docId), 0);
-    srm2.getHit(1, docId, rank);
-    srm2.getSortBlob(1, buf, sz);
-    EXPECT_EQUAL(sz, 9u);
-    EXPECT_EQUAL(memcmp("sortdata2", buf, sz), 0);
-    EXPECT_EQUAL(rank, SearchResultMessage::RankType(89));
-    EXPECT_EQUAL(strcmp("doc1", docId), 0);
-    srm2.getHit(2, docId, rank);
-    srm2.getSortBlob(2, buf, sz);
-    EXPECT_EQUAL(sz, 9u);
-    EXPECT_EQUAL(memcmp("sortdata3", buf, sz), 0);
-    EXPECT_EQUAL(rank, SearchResultMessage::RankType(90));
-    EXPECT_EQUAL(strcmp("doc18", docId), 0);
-
-    EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 108u, serialize("SearchResultMessage-5", srm2));
-    routable = deserialize("SearchResultMessage-5", DocumentProtocol::MESSAGE_SEARCHRESULT, LANG_CPP);
-    if (!EXPECT_TRUE(routable)) {
-        return false;
-    }
-    dm = static_cast<SearchResultMessage *>(routable.get());
-    EXPECT_EQUAL(dm->getHitCount(), size_t(3));
-    dm->getHit(0, docId, rank);
-    dm->getSortBlob(0, buf, sz);
-    EXPECT_EQUAL(sz, 9u);
-    EXPECT_EQUAL(memcmp("sortdata1", buf, sz), 0);
-    EXPECT_EQUAL(rank, SearchResultMessage::RankType(109));
-    EXPECT_EQUAL(strcmp("doc17", docId), 0);
-    dm->getHit(1, docId, rank);
-    dm->getSortBlob(1, buf, sz);
-    EXPECT_EQUAL(sz, 9u);
-    EXPECT_EQUAL(memcmp("sortdata2", buf, sz), 0);
-    EXPECT_EQUAL(rank, SearchResultMessage::RankType(89));
-    EXPECT_EQUAL(strcmp("doc1", docId), 0);
-    dm->getHit(2, docId, rank);
-    dm->getSortBlob(2, buf, sz);
-    EXPECT_EQUAL(sz, 9u);
-    EXPECT_EQUAL(memcmp("sortdata3", buf, sz), 0);
-    EXPECT_EQUAL(rank, SearchResultMessage::RankType(90));
-    EXPECT_EQUAL(strcmp("doc18", docId), 0);
-    return true;
-}
-
-bool
 Messages60Test::testUpdateDocumentMessage()
 {
     const DocumentTypeRepo & repo = getTypeRepo();
@@ -913,12 +723,6 @@ Messages60Test::testDocumentListReply()
 }
 
 bool
-Messages60Test::testDocumentSummaryReply()
-{
-    return tryVisitorReply("DocumentSummaryReply", DocumentProtocol::REPLY_DOCUMENTSUMMARY);
-}
-
-bool
 Messages60Test::testGetDocumentReply()
 {
     document::Document::SP doc =
@@ -947,12 +751,6 @@ Messages60Test::testMapVisitorReply()
 }
 
 bool
-Messages60Test::testSearchResultReply()
-{
-    return tryVisitorReply("SearchResultReply", DocumentProtocol::REPLY_SEARCHRESULT);
-}
-
-bool
 Messages60Test::testStatBucketReply()
 {
     StatBucketReply msg;
diff --git a/documentapi/src/tests/messages/messages60test.h b/documentapi/src/tests/messages/messages60test.h
index 1eb3e8e248f..4a2a3f98fad 100644
--- a/documentapi/src/tests/messages/messages60test.h
+++ b/documentapi/src/tests/messages/messages60test.h
@@ -24,7 +24,6 @@ public:
     bool testDocumentListMessage();
     bool testDocumentListReply();
     bool testDocumentSummaryMessage();
-    bool testDocumentSummaryReply();
     bool testEmptyBucketsMessage();
     bool testEmptyBucketsReply();
     bool testGetBucketListMessage();
@@ -44,7 +43,6 @@ public:
     bool testRemoveLocationMessage();
     bool testRemoveLocationReply();
     bool testSearchResultMessage();
-    bool testSearchResultReply();
     bool testStatBucketMessage();
     bool testStatBucketReply();
     bool testUpdateDocumentMessage();
diff --git a/documentapi/src/vespa/documentapi/documentapi.h b/documentapi/src/vespa/documentapi/documentapi.h
index 311199c94cd..b784a63a642 100644
--- a/documentapi/src/vespa/documentapi/documentapi.h
+++ b/documentapi/src/vespa/documentapi/documentapi.h
@@ -11,9 +11,7 @@
 #include <vespa/documentapi/messagebus/messages/updatedocumentreply.h>
 #include <vespa/documentapi/messagebus/messages/feedreply.h>
 #include <vespa/documentapi/messagebus/messages/updatedocumentmessage.h>
-#include <vespa/documentapi/messagebus/messages/searchresultmessage.h>
 #include <vespa/documentapi/messagebus/messages/visitor.h>
-#include <vespa/documentapi/messagebus/messages/documentsummarymessage.h>
 #include <vespa/documentapi/messagebus/messages/wrongdistributionreply.h>
 #include <vespa/documentapi/messagebus/messages/getbucketlistmessage.h>
 #include <vespa/documentapi/messagebus/messages/getbucketlistreply.h>
diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp
index d751d11177c..1eb50bba714 100644
--- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp
@@ -49,7 +49,6 @@ DocumentProtocol::DocumentProtocol(std::shared_ptr<const DocumentTypeRepo> repo,
     putRoutableFactory(MESSAGE_CREATEVISITOR, std::make_shared<RoutableFactories60::CreateVisitorMessageFactory>(), from6);
     putRoutableFactory(MESSAGE_DESTROYVISITOR, std::make_shared<RoutableFactories60::DestroyVisitorMessageFactory>(), from6);
     putRoutableFactory(MESSAGE_DOCUMENTLIST, std::make_shared<RoutableFactories60::DocumentListMessageFactory>(*_repo), from6);
-    putRoutableFactory(MESSAGE_DOCUMENTSUMMARY, std::make_shared<RoutableFactories60::DocumentSummaryMessageFactory>(), from6);
     putRoutableFactory(MESSAGE_EMPTYBUCKETS, std::make_shared<RoutableFactories60::EmptyBucketsMessageFactory>(), from6);
     putRoutableFactory(MESSAGE_GETBUCKETLIST, std::make_shared<RoutableFactories60::GetBucketListMessageFactory>(), from6);
     putRoutableFactory(MESSAGE_GETBUCKETSTATE, std::make_shared<RoutableFactories60::GetBucketStateMessageFactory>(), from6);
@@ -59,7 +58,6 @@ DocumentProtocol::DocumentProtocol(std::shared_ptr<const DocumentTypeRepo> repo,
     putRoutableFactory(MESSAGE_QUERYRESULT, std::make_shared<RoutableFactories60::QueryResultMessageFactory>(), from6);
     putRoutableFactory(MESSAGE_REMOVEDOCUMENT, std::make_shared<RoutableFactories60::RemoveDocumentMessageFactory>(), from6);
     putRoutableFactory(MESSAGE_REMOVELOCATION, std::make_shared<RoutableFactories60::RemoveLocationMessageFactory>(*_repo), from6);
-    putRoutableFactory(MESSAGE_SEARCHRESULT, std::make_shared<RoutableFactories60::SearchResultMessageFactory>(), from6);
     putRoutableFactory(MESSAGE_STATBUCKET, std::make_shared<RoutableFactories60::StatBucketMessageFactory>(), from6);
     putRoutableFactory(MESSAGE_UPDATEDOCUMENT, std::make_shared<RoutableFactories60::UpdateDocumentMessageFactory>(*_repo), from6);
     putRoutableFactory(MESSAGE_VISITORINFO, std::make_shared<RoutableFactories60::VisitorInfoMessageFactory>(), from6);
@@ -67,7 +65,6 @@ DocumentProtocol::DocumentProtocol(std::shared_ptr<const DocumentTypeRepo> repo,
     putRoutableFactory(REPLY_DESTROYVISITOR, std::make_shared<RoutableFactories60::DestroyVisitorReplyFactory>(), from6);
     putRoutableFactory(REPLY_DOCUMENTIGNORED, std::make_shared<RoutableFactories60::DocumentIgnoredReplyFactory>(), from6);
     putRoutableFactory(REPLY_DOCUMENTLIST, std::make_shared<RoutableFactories60::DocumentListReplyFactory>(), from6);
-    putRoutableFactory(REPLY_DOCUMENTSUMMARY, std::make_shared<RoutableFactories60::DocumentSummaryReplyFactory>(), from6);
     putRoutableFactory(REPLY_EMPTYBUCKETS, std::make_shared<RoutableFactories60::EmptyBucketsReplyFactory>(), from6);
     putRoutableFactory(REPLY_GETBUCKETLIST, std::make_shared<RoutableFactories60::GetBucketListReplyFactory>(), from6);
     putRoutableFactory(REPLY_GETBUCKETSTATE, std::make_shared<RoutableFactories60::GetBucketStateReplyFactory>(), from6);
@@ -77,7 +74,6 @@ DocumentProtocol::DocumentProtocol(std::shared_ptr<const DocumentTypeRepo> repo,
     putRoutableFactory(REPLY_QUERYRESULT, std::make_shared<RoutableFactories60::QueryResultReplyFactory>(), from6);
     putRoutableFactory(REPLY_REMOVEDOCUMENT, std::make_shared<RoutableFactories60::RemoveDocumentReplyFactory>(), from6);
     putRoutableFactory(REPLY_REMOVELOCATION, std::make_shared<RoutableFactories60::RemoveLocationReplyFactory>(), from6);
-    putRoutableFactory(REPLY_SEARCHRESULT, std::make_shared<RoutableFactories60::SearchResultReplyFactory>(), from6);
     putRoutableFactory(REPLY_STATBUCKET, std::make_shared<RoutableFactories60::StatBucketReplyFactory>(), from6);
     putRoutableFactory(REPLY_UPDATEDOCUMENT, std::make_shared<RoutableFactories60::UpdateDocumentReplyFactory>(), from6);
     putRoutableFactory(REPLY_VISITORINFO, std::make_shared<RoutableFactories60::VisitorInfoReplyFactory>(), from6);
diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h
index 9f0d7253335..879f769af3b 100644
--- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h
+++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.h
@@ -55,9 +55,9 @@ public:
         MESSAGE_CREATEVISITOR       = DOCUMENT_MESSAGE + 7,
         MESSAGE_DESTROYVISITOR      = DOCUMENT_MESSAGE + 8,
         MESSAGE_VISITORINFO         = DOCUMENT_MESSAGE + 9,
-        MESSAGE_SEARCHRESULT        = DOCUMENT_MESSAGE + 11,
+        // MESSAGE_SEARCHRESULT       = DOCUMENT_MESSAGE + 11,
         //MESSAGE_MULTIOPERATION      = DOCUMENT_MESSAGE + 13,
-        MESSAGE_DOCUMENTSUMMARY     = DOCUMENT_MESSAGE + 14,
+        // MESSAGE_DOCUMENTSUMMARY    = DOCUMENT_MESSAGE + 14,
         MESSAGE_MAPVISITOR          = DOCUMENT_MESSAGE + 15,
         MESSAGE_GETBUCKETSTATE      = DOCUMENT_MESSAGE + 18,
         MESSAGE_STATBUCKET          = DOCUMENT_MESSAGE + 19,
@@ -78,9 +78,9 @@ public:
         REPLY_CREATEVISITOR         = DOCUMENT_REPLY + 7,
         REPLY_DESTROYVISITOR        = DOCUMENT_REPLY + 8,
         REPLY_VISITORINFO           = DOCUMENT_REPLY + 9,
-        REPLY_SEARCHRESULT          = DOCUMENT_REPLY + 11,
+        // REPLY_SEARCHRESULT         = DOCUMENT_REPLY + 11,
         //REPLY_MULTIOPERATION        = DOCUMENT_REPLY + 13,
-        REPLY_DOCUMENTSUMMARY       = DOCUMENT_REPLY + 14,
+        // REPLY_DOCUMENTSUMMARY      = DOCUMENT_REPLY + 14,
         REPLY_MAPVISITOR            = DOCUMENT_REPLY + 15,
         REPLY_GETBUCKETSTATE        = DOCUMENT_REPLY + 18,
         REPLY_STATBUCKET            = DOCUMENT_REPLY + 19,
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/CMakeLists.txt b/documentapi/src/vespa/documentapi/messagebus/messages/CMakeLists.txt
index ddbe66fc22a..d906166b6df 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/CMakeLists.txt
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/CMakeLists.txt
@@ -5,7 +5,6 @@ vespa_add_library(documentapi_documentapimessages OBJECT
     documentmessage.cpp
     documentreply.cpp
     documentstate.cpp
-    documentsummarymessage.cpp
     emptybucketsmessage.cpp
     feedanswer.cpp
     feedmessage.cpp
@@ -21,7 +20,6 @@ vespa_add_library(documentapi_documentapimessages OBJECT
     removedocumentmessage.cpp
     removedocumentreply.cpp
     removelocationmessage.cpp
-    searchresultmessage.cpp
     statbucketmessage.cpp
     statbucketreply.cpp
     testandsetmessage.cpp
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.cpp
deleted file mode 100644
index 6be241b2e1d..00000000000
--- a/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "documentsummarymessage.h"
-
-using vdslib::DocumentSummary;
-
-namespace documentapi {
-
-DocumentSummaryMessage::DocumentSummaryMessage(const DocumentSummary & sr) :
-    VisitorMessage(),
-    DocumentSummary(sr)
-{
-    // empty
-}
-
-DocumentSummaryMessage::DocumentSummaryMessage() :
-    VisitorMessage(),
-    DocumentSummary()
-{
-    // empty
-}
-
-DocumentReply::UP
-DocumentSummaryMessage::doCreateReply() const
-{
-    return DocumentReply::UP(new VisitorReply(DocumentProtocol::REPLY_DOCUMENTSUMMARY));
-}
-
-uint32_t
-DocumentSummaryMessage::getApproxSize() const
-{
-    return DocumentSummary::getSerializedSize();
-}
-
-uint32_t
-DocumentSummaryMessage::getType() const
-{
-    return DocumentProtocol::MESSAGE_DOCUMENTSUMMARY;
-}
-
-}
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h
deleted file mode 100644
index 2c8149ab058..00000000000
--- a/documentapi/src/vespa/documentapi/messagebus/messages/documentsummarymessage.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include "visitor.h"
-#include <vespa/vdslib/container/documentsummary.h>
-
-namespace documentapi {
-
-class DocumentSummaryMessage : public VisitorMessage,
-                               public vdslib::DocumentSummary {
-protected:
-    // Implements VisitorMessage.
-    DocumentReply::UP doCreateReply() const override;
-
-public:
-    /**
-     * Convenience typedef.
-     */
-    using UP = std::unique_ptr<DocumentSummaryMessage>;
-    using SP = std::shared_ptr<DocumentSummaryMessage>;
-
-    /**
-     * Constructs a new document message with no content.
-     */
-    DocumentSummaryMessage();
-
-    /**
-     * Constructs a new document message with summary comment.
-     *
-     * @param summary The document summary to contain.
-     */
-    DocumentSummaryMessage(const vdslib::DocumentSummary &summary);
-    uint32_t getApproxSize() const override;
-    uint32_t getType() const override;
-    string toString() const override { return "documentsummarymessage"; }
-};
-
-}
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.cpp
deleted file mode 100644
index 8e25e70d749..00000000000
--- a/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "searchresultmessage.h"
-
-using vdslib::SearchResult;
-
-namespace documentapi {
-
-SearchResultMessage::SearchResultMessage() :
-    VisitorMessage(),
-    SearchResult()
-{
-    // empty
-}
-
-SearchResultMessage::SearchResultMessage(SearchResult &&result) :
-    VisitorMessage(),
-    SearchResult(std::move(result))
-{
-    // empty
-}
-
-DocumentReply::UP
-SearchResultMessage::doCreateReply() const
-{
-    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_SEARCHRESULT);
-}
-
-uint32_t
-SearchResultMessage::getApproxSize() const
-{
-    return SearchResult::getSerializedSize();
-}
-
-uint32_t
-SearchResultMessage::getType() const
-{
-    return DocumentProtocol::MESSAGE_SEARCHRESULT;
-}
-
-}
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.h
deleted file mode 100644
index d22f8197534..00000000000
--- a/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include "visitor.h"
-#include <vespa/vdslib/container/searchresult.h>
-
-namespace documentapi {
-
-class SearchResultMessage : public VisitorMessage,
-                            public vdslib::SearchResult {
-protected:
-    DocumentReply::UP doCreateReply() const override;
-
-public:
-    using UP = std::unique_ptr<SearchResultMessage>;
-    using SP = std::shared_ptr<SearchResultMessage>;
-
-    SearchResultMessage();
-    SearchResultMessage(vdslib::SearchResult &&result);
-
-    uint32_t getApproxSize() const override;
-    uint32_t getType() const override;
-    string toString() const override { return "searchresultmessage"; }
-};
-
-}
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
index 1dce7ff281f..508bb25c907 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
@@ -258,37 +258,6 @@ RoutableFactories60::DocumentListReplyFactory::doEncode(const DocumentReply &, v
 }
 
 DocumentMessage::UP
-RoutableFactories60::DocumentSummaryMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto msg = std::make_unique<DocumentSummaryMessage>();
-
-    msg->deserialize(buf);
-
-    return msg;
-}
-
-bool
-RoutableFactories60::DocumentSummaryMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const DocumentSummaryMessage &msg = static_cast<const DocumentSummaryMessage&>(obj);
-    msg.serialize(buf);
-
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories60::DocumentSummaryReplyFactory::doDecode(document::ByteBuffer &) const
-{
-    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_DOCUMENTSUMMARY);
-}
-
-bool
-RoutableFactories60::DocumentSummaryReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
-{
-    return true;
-}
-
-DocumentMessage::UP
 RoutableFactories60::EmptyBucketsMessageFactory::doDecode(document::ByteBuffer &buf) const
 {
     auto msg = std::make_unique<EmptyBucketsMessage>();
@@ -642,23 +611,6 @@ RoutableFactories60::RemoveLocationReplyFactory::doEncode(const DocumentReply &,
 }
 
 DocumentMessage::UP
-RoutableFactories60::SearchResultMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto msg = std::make_unique<SearchResultMessage>();
-    msg->deserialize(buf);
-    return msg;
-}
-
-bool
-RoutableFactories60::SearchResultMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const auto & msg = static_cast<const SearchResultMessage&>(obj);
-    msg.serialize(buf);
-
-    return true;
-}
-
-DocumentMessage::UP
 RoutableFactories60::QueryResultMessageFactory::doDecode(document::ByteBuffer &buf) const
 {
     auto msg = std::make_unique<QueryResultMessage>();
@@ -680,18 +632,6 @@ RoutableFactories60::QueryResultMessageFactory::doEncode(const DocumentMessage &
 }
 
 DocumentReply::UP
-RoutableFactories60::SearchResultReplyFactory::doDecode(document::ByteBuffer &) const
-{
-    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_SEARCHRESULT);
-}
-
-bool
-RoutableFactories60::SearchResultReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
-{
-    return true;
-}
-
-DocumentReply::UP
 RoutableFactories60::QueryResultReplyFactory::doDecode(document::ByteBuffer &) const
 {
     return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_QUERYRESULT);
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.h
index b618d92a145..c0cbc4868eb 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.h
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.h
@@ -172,16 +172,6 @@ public:
         DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
         bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
     };
-    class DocumentSummaryMessageFactory : public DocumentMessageFactory {
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class DocumentSummaryReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
     class EmptyBucketsMessageFactory : public DocumentMessageFactory {
     protected:
         DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
@@ -282,16 +272,6 @@ public:
         DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
         bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
     };
-    class SearchResultMessageFactory : public DocumentMessageFactory {
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class SearchResultReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
     class StatBucketMessageFactory : public DocumentMessageFactory {
         virtual bool encodeBucketSpace(vespalib::stringref bucketSpace, vespalib::GrowableByteBuffer& buf) const;
         virtual string decodeBucketSpace(document::ByteBuffer&) const;
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-1.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-1.dat
deleted file mode 100644
index 0107dd5f350..00000000000
--- a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-1.dat
+++ /dev/null
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-2.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-2.dat
deleted file mode 100644
index 57187093f28..00000000000
--- a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-2.dat
+++ /dev/null
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-3.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-3.dat
deleted file mode 100644
index 6a516d38d17..00000000000
--- a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryMessage-3.dat
+++ /dev/null
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryReply.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryReply.dat
deleted file mode 100644
index 16b1e4bc4ef..00000000000
--- a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentSummaryReply.dat
+++ /dev/null
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-1.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-1.dat
deleted file mode 100644
index 988f9fdab1f..00000000000
--- a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-1.dat
+++ /dev/null
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-2.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-2.dat
deleted file mode 100644
index ac277d09643..00000000000
--- a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-2.dat
+++ /dev/null
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-3.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-3.dat
deleted file mode 100644
index 03b49c8a0ac..00000000000
--- a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-3.dat
+++ /dev/null
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-4.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-4.dat
deleted file mode 100644
index d52e574ea44..00000000000
--- a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-4.dat
+++ /dev/null
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-5.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-5.dat
deleted file mode 100644
index e68654e9941..00000000000
--- a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultMessage-5.dat
+++ /dev/null
diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultReply.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultReply.dat
deleted file mode 100644
index cce9c6f8d14..00000000000
--- a/documentapi/test/crosslanguagefiles/6.221-cpp-SearchResultReply.dat
+++ /dev/null
diff --git a/documentapi/test/crosslanguagefiles/6.221-java-DocumentSummaryReply.dat b/documentapi/test/crosslanguagefiles/6.221-java-DocumentSummaryReply.dat
deleted file mode 100644
index 16b1e4bc4ef..00000000000
--- a/documentapi/test/crosslanguagefiles/6.221-java-DocumentSummaryReply.dat
+++ /dev/null
diff --git a/documentapi/test/crosslanguagefiles/6.221-java-SearchResultReply.dat b/documentapi/test/crosslanguagefiles/6.221-java-SearchResultReply.dat
deleted file mode 100644
index cce9c6f8d14..00000000000
--- a/documentapi/test/crosslanguagefiles/6.221-java-SearchResultReply.dat
+++ /dev/null
diff --git a/searchlib/src/vespa/searchlib/attribute/extendableattributes.h b/searchlib/src/vespa/searchlib/attribute/extendableattributes.h
index cc2cb216bbb..bc884f9020e 100644
--- a/searchlib/src/vespa/searchlib/attribute/extendableattributes.h
+++ b/searchlib/src/vespa/searchlib/attribute/extendableattributes.h
@@ -2,7 +2,7 @@
 /**
  * @class search::SearchVisitor
  *
- * @brief Visitor that applies a search query to visitor data and converts them to a SearchResultCommand
+ * @brief Visitor that applies a search query to visitor data and converts them to a QueryResultCommand
  */
 #pragma once
 
diff --git a/searchlib/src/vespa/searchlib/attribute/extendableattributes.hpp b/searchlib/src/vespa/searchlib/attribute/extendableattributes.hpp
index c515a1bec7f..0b1d1221df2 100644
--- a/searchlib/src/vespa/searchlib/attribute/extendableattributes.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/extendableattributes.hpp
@@ -2,7 +2,7 @@
 /**
  * @class search::SearchVisitor
  *
- * @brief Visitor that applies a search query to visitor data and converts them to a SearchResultCommand
+ * @brief Visitor that applies a search query to visitor data and converts them to a QueryResultCommand
  */
 #pragma once
 
diff --git a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp
index 9ae6aaf0653..e7eb7a752fb 100644
--- a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp
+++ b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp
@@ -8,11 +8,9 @@
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/storage/common/bucket_resolver.h>
 #include <vespa/storageapi/message/datagram.h>
-#include <vespa/storageapi/message/documentsummary.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/storageapi/message/queryresult.h>
 #include <vespa/storageapi/message/removelocation.h>
-#include <vespa/storageapi/message/searchresult.h>
 #include <vespa/storageapi/message/stat.h>
 #include <vespa/storageapi/message/visitor.h>
 #include <vespa/messagebus/error.h>
@@ -237,24 +235,12 @@ DocumentApiConverter::toDocumentAPI(api::StorageCommand& fromMsg)
         toMsg = std::move(to);
         break;
     }
-    case api::MessageType::SEARCHRESULT_ID:
-    {
-        auto & from(static_cast<api::SearchResultCommand&>(fromMsg));
-        toMsg = std::make_unique<documentapi::SearchResultMessage>(std::move(from));
-        break;
-    }
     case api::MessageType::QUERYRESULT_ID:
     {
         auto & from(static_cast<api::QueryResultCommand&>(fromMsg));
         toMsg = std::make_unique<documentapi::QueryResultMessage>(std::move(from.getSearchResult()), from.getDocumentSummary());
         break;
     }
-    case api::MessageType::DOCUMENTSUMMARY_ID:
-    {
-        auto & from(static_cast<api::DocumentSummaryCommand&>(fromMsg));
-        toMsg = std::make_unique<documentapi::DocumentSummaryMessage>(from);
-        break;
-    }
     case api::MessageType::MAPVISITOR_ID:
     {
         auto & from(static_cast<api::MapVisitorCommand&>(fromMsg));
diff --git a/storage/src/vespa/storageapi/message/CMakeLists.txt b/storage/src/vespa/storageapi/message/CMakeLists.txt
index 2a761921dff..2728b5b51ad 100644
--- a/storage/src/vespa/storageapi/message/CMakeLists.txt
+++ b/storage/src/vespa/storageapi/message/CMakeLists.txt
@@ -6,9 +6,7 @@ vespa_add_library(storageapi_message OBJECT
     bucket.cpp
     visitor.cpp
     state.cpp
-    searchresult.cpp
     bucketsplitting.cpp
-    documentsummary.cpp
     stat.cpp
     removelocation.cpp
     queryresult.cpp
diff --git a/storage/src/vespa/storageapi/message/documentsummary.cpp b/storage/src/vespa/storageapi/message/documentsummary.cpp
deleted file mode 100644
index 6909b4d223c..00000000000
--- a/storage/src/vespa/storageapi/message/documentsummary.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include "documentsummary.h"
-#include <ostream>
-
-namespace storage {
-namespace api {
-
-IMPLEMENT_COMMAND(DocumentSummaryCommand, DocumentSummaryReply)
-IMPLEMENT_REPLY(DocumentSummaryReply)
-
-DocumentSummaryCommand::DocumentSummaryCommand()
-    : StorageCommand(MessageType::DOCUMENTSUMMARY),
-      DocumentSummary()
-{ }
-
-void
-DocumentSummaryCommand::print(std::ostream& out, bool verbose,
-                              const std::string& indent) const
-{
-    out << "DocumentSummary(" << getSummaryCount() << " summaries)";
-    if (verbose) {
-        out << " : ";
-        StorageCommand::print(out, verbose, indent);
-    }
-}
-
-DocumentSummaryReply::DocumentSummaryReply(const DocumentSummaryCommand& cmd)
-    : StorageReply(cmd)
-{ }
-
-void
-DocumentSummaryReply::print(std::ostream& out, bool verbose,
-                            const std::string& indent) const
-{
-    out << "DocumentSummaryReply()";
-    if (verbose) {
-        out << " : ";
-        StorageReply::print(out, verbose, indent);
-    }
-}
-
-} // api
-} // storage
diff --git a/storage/src/vespa/storageapi/message/documentsummary.h b/storage/src/vespa/storageapi/message/documentsummary.h
deleted file mode 100644
index 5e2c1af3cfd..00000000000
--- a/storage/src/vespa/storageapi/message/documentsummary.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include "visitor.h"
-#include <vespa/vdslib/container/documentsummary.h>
-
-namespace storage {
-namespace api {
-
-/**
- * @class DocumentSummaryCommand
- * @ingroup message
- *
- * @brief The result of a searchvisitor.
- */
-class DocumentSummaryCommand : public StorageCommand,
-                               public vdslib::DocumentSummary
-{
-public:
-    explicit DocumentSummaryCommand();
-    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
-    DECLARE_STORAGECOMMAND(DocumentSummaryCommand, onDocumentSummary)
-};
-
-/**
- * @class DocumentSummaryReply
- * @ingroup message
- *
- * @brief Response to a document summary command.
- */
-class DocumentSummaryReply : public StorageReply {
-public:
-    explicit DocumentSummaryReply(const DocumentSummaryCommand& command);
-    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
-    DECLARE_STORAGEREPLY(DocumentSummaryReply, onDocumentSummaryReply)
-};
-
-} // api
-} // storage
diff --git a/storage/src/vespa/storageapi/message/searchresult.cpp b/storage/src/vespa/storageapi/message/searchresult.cpp
deleted file mode 100644
index b2cf04b0410..00000000000
--- a/storage/src/vespa/storageapi/message/searchresult.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "searchresult.h"
-#include <ostream>
-
-using vdslib::SearchResult;
-
-namespace storage {
-namespace api {
-
-IMPLEMENT_COMMAND(SearchResultCommand, SearchResultReply)
-IMPLEMENT_REPLY(SearchResultReply)
-
-SearchResultCommand::SearchResultCommand()
-    : StorageCommand(MessageType::SEARCHRESULT),
-      SearchResult()
-{
-}
-
-void
-SearchResultCommand::print(std::ostream& out, bool verbose,
-                           const std::string& indent) const
-{
-    out << "SearchResultCommand(" << getHitCount() << " hits)";
-    if (verbose) {
-        out << " : ";
-        StorageCommand::print(out, verbose, indent);
-    }
-}
-
-SearchResultReply::SearchResultReply(const SearchResultCommand& cmd)
-    : StorageReply(cmd)
-{ }
-
-void
-SearchResultReply::print(std::ostream& out, bool verbose,
-                         const std::string& indent) const
-{
-    out << "SearchResultReply()";
-    if (verbose) {
-        out << " : ";
-        StorageReply::print(out, verbose, indent);
-    }
-}
-
-} // api
-} // storage
diff --git a/storage/src/vespa/storageapi/message/searchresult.h b/storage/src/vespa/storageapi/message/searchresult.h
deleted file mode 100644
index b12fa5e1613..00000000000
--- a/storage/src/vespa/storageapi/message/searchresult.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include "visitor.h"
-#include <vespa/vdslib/container/searchresult.h>
-
-namespace storage::api {
-
-/**
- * @class SearchResultCommand
- * @ingroup message
- *
- * @brief The result of a searchvisitor.
- */
-class SearchResultCommand : public StorageCommand, public vdslib::SearchResult {
-public:
-    SearchResultCommand();
-    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
-    DECLARE_STORAGECOMMAND(SearchResultCommand, onSearchResult)
-};
-
-/**
- * @class SearchResultReply
- * @ingroup message
- *
- * @brief Response to a search result command.
- */
-class SearchResultReply : public StorageReply {
-public:
-    explicit SearchResultReply(const SearchResultCommand& command);
-    void print(std::ostream& out, bool verbose, const std::string& indent) const override;
-    DECLARE_STORAGEREPLY(SearchResultReply, onSearchResultReply)
-};
-
-}
diff --git a/storage/src/vespa/storageapi/messageapi/messagehandler.h b/storage/src/vespa/storageapi/messageapi/messagehandler.h
index 9ba8542e9db..fa362d5380f 100644
--- a/storage/src/vespa/storageapi/messageapi/messagehandler.h
+++ b/storage/src/vespa/storageapi/messageapi/messagehandler.h
@@ -29,8 +29,6 @@ class CreateVisitorCommand; // Create a new visitor
 class DestroyVisitorCommand; // Destroy a running visitor
 class VisitorInfoCommand; // Sends visitor info to visitor controller
 class MapVisitorCommand;
-class SearchResultCommand;
-class DocumentSummaryCommand;
 class QueryResultCommand;
 
 class InternalCommand;
@@ -67,8 +65,6 @@ class CreateVisitorReply;
 class DestroyVisitorReply;
 class VisitorInfoReply;
 class MapVisitorReply;
-class SearchResultReply;
-class DocumentSummaryReply;
 class QueryResultReply;
 
 class InternalReply;
@@ -137,12 +133,8 @@ public:
     virtual bool onVisitorInfoReply(const std::shared_ptr<api::VisitorInfoReply>&) { return false; }
     virtual bool onMapVisitor(const std::shared_ptr<api::MapVisitorCommand>&) { return false; }
     virtual bool onMapVisitorReply(const std::shared_ptr<api::MapVisitorReply>&) { return false; }
-    virtual bool onSearchResult(const std::shared_ptr<api::SearchResultCommand>&) { return false; }
-    virtual bool onSearchResultReply(const std::shared_ptr<api::SearchResultReply>&) { return false; }
     virtual bool onQueryResult(const std::shared_ptr<api::QueryResultCommand>&) { return false; }
     virtual bool onQueryResultReply(const std::shared_ptr<api::QueryResultReply>&) { return false; }
-    virtual bool onDocumentSummary(const std::shared_ptr<api::DocumentSummaryCommand>&) { return false; }
-    virtual bool onDocumentSummaryReply(const std::shared_ptr<api::DocumentSummaryReply>&) { return false; }
     virtual bool onEmptyBuckets(const std::shared_ptr<api::EmptyBucketsCommand>&) { return false; }
     virtual bool onEmptyBucketsReply(const std::shared_ptr<api::EmptyBucketsReply>&) { return false; }
     virtual bool onInternal(const std::shared_ptr<api::InternalCommand>&) { return false; }
diff --git a/storage/src/vespa/storageapi/messageapi/storagemessage.cpp b/storage/src/vespa/storageapi/messageapi/storagemessage.cpp
index b1d68fd77e3..c72ece80476 100644
--- a/storage/src/vespa/storageapi/messageapi/storagemessage.cpp
+++ b/storage/src/vespa/storageapi/messageapi/storagemessage.cpp
@@ -76,10 +76,6 @@ const MessageType MessageType::APPLYBUCKETDIFF("ApplyBucketDiff", APPLYBUCKETDIF
 const MessageType MessageType::APPLYBUCKETDIFF_REPLY("ApplyBucketDiff reply", APPLYBUCKETDIFF_REPLY_ID, &MessageType::APPLYBUCKETDIFF);
 const MessageType MessageType::VISITOR_INFO("VisitorInfo", VISITOR_INFO_ID);
 const MessageType MessageType::VISITOR_INFO_REPLY("VisitorInfo reply", VISITOR_INFO_REPLY_ID, &MessageType::VISITOR_INFO);
-const MessageType MessageType::SEARCHRESULT("SearchResult", SEARCHRESULT_ID);
-const MessageType MessageType::SEARCHRESULT_REPLY("SearchResult reply", SEARCHRESULT_REPLY_ID, &MessageType::SEARCHRESULT);
-const MessageType MessageType::DOCUMENTSUMMARY("DocumentSummary", DOCUMENTSUMMARY_ID);
-const MessageType MessageType::DOCUMENTSUMMARY_REPLY("DocumentSummary reply", DOCUMENTSUMMARY_REPLY_ID, &MessageType::DOCUMENTSUMMARY);
 const MessageType MessageType::MAPVISITOR("Mapvisitor", MAPVISITOR_ID);
 const MessageType MessageType::MAPVISITOR_REPLY("Mapvisitor reply", MAPVISITOR_REPLY_ID, &MessageType::MAPVISITOR);
 const MessageType MessageType::SPLITBUCKET("SplitBucket", SPLITBUCKET_ID);
diff --git a/storage/src/vespa/storageapi/messageapi/storagemessage.h b/storage/src/vespa/storageapi/messageapi/storagemessage.h
index 282f110646d..4649781c1e5 100644
--- a/storage/src/vespa/storageapi/messageapi/storagemessage.h
+++ b/storage/src/vespa/storageapi/messageapi/storagemessage.h
@@ -122,14 +122,14 @@ public:
         DOCBLOCK_REPLY_ID = 59,
         VISITOR_INFO_ID = 60,
         VISITOR_INFO_REPLY_ID = 61,
-        SEARCHRESULT_ID = 64,
-        SEARCHRESULT_REPLY_ID = 65,
+        // SEARCHRESULT_ID = 64,
+        // SEARCHRESULT_REPLY_ID = 65,
         SPLITBUCKET_ID = 66,
         SPLITBUCKET_REPLY_ID = 67,
         JOINBUCKETS_ID = 68,
         JOINBUCKETS_REPLY_ID = 69,
-        DOCUMENTSUMMARY_ID = 72,
-        DOCUMENTSUMMARY_REPLY_ID = 73,
+        // DOCUMENTSUMMARY_ID = 72,
+        // DOCUMENTSUMMARY_REPLY_ID = 73,
         MAPVISITOR_ID = 74,
         MAPVISITOR_REPLY_ID = 75,
         STATBUCKET_ID = 76,
@@ -208,14 +208,10 @@ public:
     static const MessageType APPLYBUCKETDIFF_REPLY;
     static const MessageType VISITOR_INFO;
     static const MessageType VISITOR_INFO_REPLY;
-    static const MessageType SEARCHRESULT;
-    static const MessageType SEARCHRESULT_REPLY;
     static const MessageType SPLITBUCKET;
     static const MessageType SPLITBUCKET_REPLY;
     static const MessageType JOINBUCKETS;
     static const MessageType JOINBUCKETS_REPLY;
-    static const MessageType DOCUMENTSUMMARY;
-    static const MessageType DOCUMENTSUMMARY_REPLY;
     static const MessageType MAPVISITOR;
     static const MessageType MAPVISITOR_REPLY;
     static const MessageType STATBUCKET;
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
index 162c031ac9e..80df69f756e 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
@@ -38,7 +38,7 @@ namespace streaming {
  * @class storage::SearchVisitor
  *
  * @brief Visitor that applies a search query to visitor data and
- * converts them to a SearchResultCommand and a DocumentSummaryCommand.
+ * converts them to a QueryResultCommand.
  **/
 class SearchVisitor : public storage::Visitor {
 public: