1 files changed, 0 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentExpirer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentExpirer.java
index d33603243e2..97f3f955a20 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentExpirer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentExpirer.java
@@ -57,10 +57,6 @@ public class DeploymentExpirer extends ControllerMaintainer {
         Optional<Duration> ttl = controller().zoneRegistry().getDeploymentTimeToLive(deployment.zone());
         if (ttl.isEmpty()) return false;
 
-        Optional<JobId> jobId = JobType.from(controller().system(), deployment.zone())
-                                       .map(type -> new JobId(instance, type));
-        if (jobId.isEmpty()) return false;
-
         return controller().jobController().lastDeploymentStart(instance, deployment)
                            .plus(ttl.get()).isBefore(controller().clock().instant());
     }