1 files changed, 5 insertions, 8 deletions

diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitor.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitor.java
index 0d162fee182..4f52d7d229c 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitor.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/ServiceMonitor.java
@@ -4,10 +4,7 @@ package com.yahoo.vespa.service.monitor;
 import com.yahoo.vespa.applicationmodel.ApplicationInstance;
 import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference;
 import com.yahoo.vespa.applicationmodel.HostName;
-import com.yahoo.vespa.applicationmodel.ServiceInstance;
 
-import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
@@ -31,8 +28,12 @@ public interface ServiceMonitor {
         return getServiceModelSnapshot().getAllApplicationInstances().keySet();
     }
 
+    default Optional<ApplicationInstanceReference> getApplicationInstanceReference(HostName hostname) {
+        return getApplication(hostname).map(ApplicationInstance::reference);
+    }
+
     default Optional<ApplicationInstance> getApplication(HostName hostname) {
-        return Optional.ofNullable(getServiceModelSnapshot().getApplicationsByHostName().get(hostname));
+        return getServiceModelSnapshot().getApplication(hostname);
     }
 
     default Optional<ApplicationInstance> getApplication(ApplicationInstanceReference reference) {
@@ -43,10 +44,6 @@ public interface ServiceMonitor {
         return getApplication(hostname);
     }
 
-    default Map<HostName, List<ServiceInstance>> getServicesByHostname() {
-        return getServiceModelSnapshot().getServiceInstancesByHostName();
-    }
-
     /**
      * Get notified of changes to the set of applications, or set of hosts assigned to an application.
      *