Inject Zone and remove unused method

2 files changed, 1 insertions, 7 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModel.java b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModel.java
index 8e918392cb0..d03824120d8 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModel.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModel.java
@@ -9,7 +9,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 public class SuperModel {
@@ -31,11 +30,6 @@ public class SuperModel {
         return models;
     }
 
-    public Set<ApplicationId> getAllApplicationIds() {
-        return models.values().stream().flatMap(entry -> entry.keySet().stream())
-                .collect(Collectors.toSet());
-    }
-
     public List<ApplicationInfo> getAllApplicationInfos() {
         return models.values().stream().flatMap(entry -> entry.values().stream()).collect(Collectors.toList());
     }
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java
index 4c7f15143ec..36702f6e97c 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/SuperModelProvider.java
@@ -13,6 +13,6 @@ public interface SuperModelProvider {
      */
     SuperModel snapshot(SuperModelListener listener);
 
-    // TODO: Remove - clients of SuperModel should get zone from elsewhere.
+    // TODO: Remove when 6.306 is latest version in use
     Zone getZone();
 }