Remove legacy headers

1 files changed, 2 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java
index 33cbb328c52..7a463ee627f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/JettyHttpServer.java
@@ -69,10 +69,9 @@ public class JettyHttpServer extends SimpleComponent implements ServerConfig.Pro
             // Enable connection log hosted Vespa
             builder.connectionLog(new ServerConfig.ConnectionLog.Builder().enabled(true));
         } else {
-            // TODO Vespa 8: Remove legacy Yahoo headers
             builder.accessLog(new ServerConfig.AccessLog.Builder()
-                    .remoteAddressHeaders(List.of("x-forwarded-for", "y-ra", "yahooremoteip", "client-ip"))
-                    .remotePortHeaders(List.of("X-Forwarded-Port", "y-rp")));
+                    .remoteAddressHeaders(List.of("x-forwarded-for"))
+                    .remotePortHeaders(List.of("X-Forwarded-Port")));
         }
         configureJettyThreadpool(builder);
         builder.stopTimeout(300);