Move deletion of all packages to deletion of application

2 files changed, 2 insertions, 2 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index bed1df3a8a7..ac317794725 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -567,6 +567,8 @@ public class ApplicationController {
                                                    new com.yahoo.vespa.hosted.controller.api.identifiers.ApplicationId(id.application().value()), token.get());
             }
             curator.removeApplication(id);
+            applicationStore.removeAll(id);
+            applicationStore.removeAll(TesterId.of(id));
 
             log.info("Deleted " + application);
         }));
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index 08fd61a626a..480e7b3b0fe 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -297,8 +297,6 @@ public class JobController {
                                    logs.delete(id);
                                }
                            });
-                       controller.applications().applicationStore().removeAll(id);
-                       controller.applications().applicationStore().removeAll(tester);
                    }
                    catch (TimeoutException e) {
                        return; // Don't remove the data if we couldn't clean up all resources.