Remove on Vespa 8

3 files changed, 0 insertions, 10 deletions

diff --git a/container-core/src/main/resources/configdefinitions/container.core.vip-status.def b/container-core/src/main/resources/configdefinitions/container.core.vip-status.def
index 61abda33302..91d5103861e 100644
--- a/container-core/src/main/resources/configdefinitions/container.core.vip-status.def
+++ b/container-core/src/main/resources/configdefinitions/container.core.vip-status.def
@@ -7,6 +7,3 @@ accessdisk bool default=false
 ## The file to serve as the status file.
 ## If the path is relative vespa home is prepended
 statusfile string default="share/qrsdocs/status.html"
-
-## Not used TODO: Remove on Vespa 8
-initiallyInRotation bool default=true
diff --git a/container-core/src/main/resources/configdefinitions/metrics.metrics-presentation.def b/container-core/src/main/resources/configdefinitions/metrics.metrics-presentation.def
deleted file mode 100644
index 2e537a00342..00000000000
--- a/container-core/src/main/resources/configdefinitions/metrics.metrics-presentation.def
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-namespace=metrics
-
-## TODO Vespa 8: remove
-slidingwindow bool default=true
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTestBase.java b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTestBase.java
index 58263548085..b87a1179832 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTestBase.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/state/StateHandlerTestBase.java
@@ -9,7 +9,6 @@ import com.yahoo.container.core.ApplicationMetadataConfig;
 import com.yahoo.container.jdisc.RequestHandlerTestDriver;
 import com.yahoo.container.jdisc.config.HealthMonitorConfig;
 import com.yahoo.jdisc.Timer;
-import com.yahoo.metrics.MetricsPresentationConfig;
 import org.junit.Before;
 import org.junit.BeforeClass;