1 files changed, 2 insertions, 15 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index d5c4d3b2d11..d2490ec9532 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -220,8 +220,6 @@ public class SearchHandler extends LoggingRequestHandler {
         Result result = new Result(query, errorMessage);
         Renderer renderer = getRendererCopy(ComponentSpecification.fromString(request.getProperty("format")));
 
-        result.getTemplating().setRenderer(renderer); // Pre-Vespa 6 Result.getEncoding() expects this TODO: Remove opn Vespa 7
-
         return new HttpSearchResponse(getHttpResponseStatus(request, result), result, query, renderer);
     }
 
@@ -282,17 +280,9 @@ public class SearchHandler extends LoggingRequestHandler {
             result = search(pathAndQuery, query, searchChain, searchChainRegistry);
         }
 
-        Renderer renderer;
-        if (result.getTemplating().usesDefaultTemplate()) { // TODO: Remove on Vespa 7
-            renderer = toRendererCopy(query.getPresentation().getRenderer());
-            result.getTemplating().setRenderer(renderer); // pre-Vespa 6 Result.getEncoding() expects this to be set.
-        }
-        else { // somebody explicitly assigned a old style template // TODO: Remove on Vespa 7
-            renderer = perRenderingCopy(result.getTemplating().getRenderer());
-        }
-
         // Transform result to response
-        HttpSearchResponse response = new HttpSearchResponse(getHttpResponseStatus(request, result), 
+        Renderer renderer = toRendererCopy(query.getPresentation().getRenderer());
+        HttpSearchResponse response = new HttpSearchResponse(getHttpResponseStatus(request, result),
                                                              result, query, renderer);
         if (hostResponseHeaderKey.isPresent())
             response.headers().add(hostResponseHeaderKey.get(), selfHostname);
@@ -351,9 +341,6 @@ public class SearchHandler extends LoggingRequestHandler {
         }
         Result result = execution.search(query);
 
-        if (result.getTemplating() == null) // TODO: Remove on Vespa 7
-            result.getTemplating().setRenderer(renderer);
-
         ensureQuerySet(result, query);
         execution.fill(result, result.getQuery().getPresentation().getSummary());