Simplify

1 files changed, 3 insertions, 10 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
index 26c658d9668..300a77d4a6b 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/DeployState.java
@@ -440,7 +440,9 @@ public class DeployState implements ConfigDefinitionStore {
             RankProfileRegistry rankProfileRegistry = new RankProfileRegistry();
             QueryProfiles queryProfiles = new QueryProfilesBuilder().build(applicationPackage, logger);
             SemanticRules semanticRules = new SemanticRuleBuilder().build(applicationPackage);
-            Application application = createApplication(rankProfileRegistry, queryProfiles, validationParameters);
+            Application application = new ApplicationBuilder(applicationPackage, fileRegistry, logger, properties,
+                                                             rankProfileRegistry, queryProfiles.getRegistry())
+                    .build(! validationParameters.ignoreValidationErrors());
             return new DeployState(application,
                                    rankProfileRegistry,
                                    fileRegistry,
@@ -465,15 +467,6 @@ public class DeployState implements ConfigDefinitionStore {
                                    reindexing);
         }
 
-        private Application createApplication(RankProfileRegistry rankProfileRegistry,
-                                              QueryProfiles queryProfiles,
-                                              ValidationParameters validationParameters) {
-            ApplicationBuilder builder = new ApplicationBuilder(applicationPackage, fileRegistry, logger, properties,
-                                                                rankProfileRegistry, queryProfiles.getRegistry());
-            builder.importFromApplicationPackage();
-            return builder.build(! validationParameters.ignoreValidationErrors());
-        }
-
     }
 
 }