2 files changed, 7 insertions, 13 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
index 8ed56b98705..496874e978b 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
@@ -5,7 +5,6 @@ import com.yahoo.component.Version;
 
 import java.util.Objects;
 import java.util.Optional;
-import java.util.Set;
 
 /**
  * A specification of a cluster - or group in a grouped cluster - to be run on a set of hosts.
@@ -62,20 +61,10 @@ public final class ClusterSpec {
         return new ClusterSpec(type, id, Optional.empty(), vespaVersion, exclusive);
     }
 
-    // TODO: Remove after June 2019
-    public static ClusterSpec request(Type type, Id id, Version vespaVersion, boolean exclusive, Set<RotationName> rotations) {
-        return new ClusterSpec(type, id, Optional.empty(), vespaVersion, exclusive);
-    }
-
     public static ClusterSpec from(Type type, Id id, Group groupId, Version vespaVersion, boolean exclusive) {
         return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion, exclusive);
     }
 
-    // TODO: Remove after June 2019
-    public static ClusterSpec from(Type type, Id id, Group groupId, Version vespaVersion, boolean exclusive, Set<RotationName> rotations) {
-        return new ClusterSpec(type, id, Optional.of(groupId), vespaVersion, exclusive);
-    }
-
     @Override
     public String toString() {
         return type + " " + id + " " + groupId.map(group -> group + " ").orElse("") + vespaVersion;
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java
index 5f3f2e10898..776f925c424 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneList.java
@@ -1,10 +1,13 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision.zone;
 
+import com.google.common.collect.ImmutableList;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.RegionName;
+import com.yahoo.config.provision.Zone;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Provides filters for and access to a list of ZoneIds.
@@ -32,7 +35,9 @@ public interface ZoneList extends ZoneFilter {
     /** Returns the ZoneApi of all zones in this list. */
     List<? extends ZoneApi> zones();
 
-    /** Returns the id of all zones in this list as — you guessed it — a list. */
-    List<ZoneId> ids();
+    /** Returns the ZoneIds of all zones in this list. */
+    default List<ZoneId> ids() {
+        return zones().stream().map(ZoneApi::getId).collect(Collectors.toList());
+    }
 
 }