GC dead code

2 files changed, 0 insertions, 8 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index f5f9215d29d..8ebe0069a29 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -1284,11 +1284,8 @@
       "public java.lang.String logFileCompressionAlgorithm(java.lang.String)",
       "public java.lang.String summaryDecodePolicy()",
       "public int contentLayerMetadataFeatureLevel()",
-      "public boolean dynamicHeapSize()",
       "public java.lang.String unknownConfigDefinition()",
       "public int searchHandlerThreadpool()",
-      "public long mergingMaxMemoryUsagePerNode()",
-      "public boolean usePerDocumentThrottledDeleteBucket()",
       "public boolean alwaysMarkPhraseExpensive()",
       "public boolean restartOnDeployWhenOnnxModelChanges()",
       "public boolean sortBlueprintsByCost()"
@@ -1371,7 +1368,6 @@
       "public abstract com.yahoo.config.application.api.FileRegistry getFileRegistry()",
       "public abstract java.util.concurrent.ExecutorService getExecutor()",
       "public java.util.Optional reindexing()",
-      "public java.util.Set restartingClusters()",
       "public abstract com.yahoo.config.model.api.ModelContext$Properties properties()",
       "public java.util.Optional appDir()",
       "public abstract com.yahoo.config.model.api.OnnxModelCost onnxModelCost()",
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index d44babdd10b..39a0fec4920 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -43,7 +43,6 @@ public interface ModelContext {
     FileRegistry getFileRegistry();
     ExecutorService getExecutor();
     default Optional<? extends Reindexing> reindexing() { return Optional.empty(); }
-    default Set<ClusterSpec.Id> restartingClusters() { return Set.of(); } // TODO: Remove after 8.290 is gone.
     Properties properties();
     default Optional<File> appDir() { return Optional.empty(); }
     OnnxModelCost onnxModelCost();
@@ -109,11 +108,8 @@ public interface ModelContext {
         @ModelFeatureFlag(owners = {"arnej"}) default String logFileCompressionAlgorithm(String defVal) { return defVal; }
         @ModelFeatureFlag(owners = {"baldersheim"}, comment = "Select summary decode type") default String summaryDecodePolicy() { return "eager"; }
         @ModelFeatureFlag(owners = {"vekterli"}) default int contentLayerMetadataFeatureLevel() { return 0; }
-        @ModelFeatureFlag(owners = {"bjorncs"}, removeAfter = "8.289") default boolean dynamicHeapSize() { return true; }
         @ModelFeatureFlag(owners = {"hmusum"}) default String unknownConfigDefinition() { return "warn"; }
         @ModelFeatureFlag(owners = {"hmusum"}) default int searchHandlerThreadpool() { return 2; }
-        @ModelFeatureFlag(owners = {"vekterli"}, removeAfter = "8.292.x") default long mergingMaxMemoryUsagePerNode() { return 0; }
-        @ModelFeatureFlag(owners = {"vekterli"}, removeAfter = "8.292.x") default boolean usePerDocumentThrottledDeleteBucket() { return true; }
         @ModelFeatureFlag(owners = {"baldersheim"}) default boolean alwaysMarkPhraseExpensive() { return false; }
         @ModelFeatureFlag(owners = {"hmusum"}, removeAfter = "8.300.x") default boolean restartOnDeployWhenOnnxModelChanges() { return true; }
         @ModelFeatureFlag(owners = {"baldersheim"}) default boolean sortBlueprintsByCost() { return false; }