1 files changed, 1 insertions, 31 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
index 559c097618f..8e8b674c888 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
@@ -54,7 +54,7 @@ public class VipStatus {
 
     /** For testing */
     public VipStatus(QrSearchersConfig dispatchers, ClustersStatus clustersStatus) {
-        this(dispatchers, new VipStatusConfig.Builder().build(), clustersStatus, StateMonitor.createForTesting());
+        this(dispatchers, new VipStatusConfig.Builder().build(), clustersStatus, StateMonitor.createForTesting(), new NullMetric());
     }
 
     @Inject
@@ -71,24 +71,6 @@ public class VipStatus {
         updateCurrentlyInRotation();
     }
 
-    @Deprecated // TODO: Remove on Vespa 8
-    public VipStatus(QrSearchersConfig dispatchers,
-                     VipStatusConfig vipStatusConfig,
-                     ClustersStatus clustersStatus,
-                     StateMonitor healthState) {
-        this(dispatchers, vipStatusConfig, clustersStatus, healthState, new NullMetric());
-    }
-
-    @Deprecated // TODO: Remove on Vespa 8
-    public VipStatus(QrSearchersConfig dispatchers, ClustersStatus clustersStatus, StateMonitor healthState) {
-        this(dispatchers, new VipStatusConfig.Builder().build(), clustersStatus, healthState);
-    }
-
-    @Deprecated // TODO: Remove on Vespa 8
-    public VipStatus(QrSearchersConfig dispatchers, VipStatusConfig ignored, ClustersStatus clustersStatus) {
-        this(dispatchers, clustersStatus);
-    }
-
     /**
      * Explicitly set this container in or out of rotation
      *
@@ -114,18 +96,6 @@ public class VipStatus {
         updateCurrentlyInRotation();
     }
 
-    /** @deprecated use addToRotation(String) instead  */
-    @Deprecated // TODO: Remove on Vespa 8
-    public void addToRotation(Object clusterIdentifier) {
-        addToRotation((String) clusterIdentifier);
-    }
-
-    /** @deprecated use removeFromRotation(String) instead  */
-    @Deprecated // TODO: Remove on Vespa 8
-    public void removeFromRotation(Object clusterIdentifier) {
-        removeFromRotation((String) clusterIdentifier);
-    }
-
     private void updateCurrentlyInRotation() {
         synchronized (mutex) {
             if (rotationOverride != null) {