Cleanup config model, part 1

Remove unused code, optimize imports, fix method signatures. No functional changes
author: Harald Musum <musum@verizonmedia.com> 2019-07-25 07:01:31 +0200
committer: Harald Musum <musum@verizonmedia.com> 2019-07-25 07:01:31 +0200
commit: 68527431b484fa1888d527ae2abab5f3f5b51fb5 (patch)
tree: ff5ef15e5e9cdfe0fdadedf83baf4480694d1a82
parent: 29a0aa78101c9bb16dd2386438721e8128362f06 (diff)
140 files changed, 132 insertions, 539 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelUtils.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelUtils.java
deleted file mode 100644
index d80df441798..00000000000
--- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelUtils.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.config.model;
-
-import java.io.Serializable;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static com.yahoo.text.Lowercase.toLowerCase;
-
-/**
- * Utilities for config models
- *
- * @author gjoranv
- */
-// TODO: Split this into appropriate classes, or move to ConfigModel superclass
-public class ConfigModelUtils implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    public static Pattern hourNmin = Pattern.compile("(\\d\\d):(\\d\\d)");
-
-    public static Map<String, Integer> day2int;
-    static {
-        day2int = new HashMap<>();
-        day2int.put("sunday", 0);
-        day2int.put("monday", 1);
-        day2int.put("tuesday", 2);
-        day2int.put("wednesday", 3);
-        day2int.put("thursday", 4);
-        day2int.put("friday", 5);
-        day2int.put("saturday", 6);
-    }
-
-    /** Parses a 24 hour clock that must be the five characters ##:## to an int stating minutes after midnight. */
-    public static int getTimeOfDay(String time) {
-        Matcher m = ConfigModelUtils.hourNmin.matcher(time);
-        if (m.matches()) {
-            return Integer.parseInt(m.group(1)) * 60 + Integer.parseInt(m.group(2));
-        }
-        throw new IllegalArgumentException("The string '" + time + "' is not in ##:## format.");
-    }
-
-    /** Parses a day of week name in english to an int, where 0 is sunday, 6 saturday. */
-    public static int getDayOfWeek(String day) {
-        return ConfigModelUtils.day2int.get(toLowerCase(day));
-    }
-
-}
diff --git a/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java b/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java
index 9178e4beca9..d94a9c1580a 100644
--- a/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java
+++ b/config-model/src/main/java/com/yahoo/config/model/MapConfigModelRegistry.java
@@ -5,20 +5,19 @@ import com.google.inject.Inject;
 import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.config.model.builder.xml.ConfigModelBuilder;
 import com.yahoo.config.model.builder.xml.ConfigModelId;
-import com.yahoo.log.LogLevel;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.FrameworkUtil;
 
-import java.util.*;
-import java.util.logging.Logger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class MapConfigModelRegistry extends ConfigModelRegistry {
 
-    private static final Logger log = Logger.getLogger(MapConfigModelRegistry.class.getPackage().getName());
     private final List<ConfigModelBuilder> builders;
 
     /**
diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/UserConfigRepo.java b/config-model/src/main/java/com/yahoo/config/model/producer/UserConfigRepo.java
index 22dce91140d..9aeb5c40b28 100644
--- a/config-model/src/main/java/com/yahoo/config/model/producer/UserConfigRepo.java
+++ b/config-model/src/main/java/com/yahoo/config/model/producer/UserConfigRepo.java
@@ -1,9 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.producer;
 
-import com.yahoo.config.application.api.DeployLogger;
-import com.yahoo.log.LogLevel;
-import com.yahoo.vespa.config.*;
+import com.yahoo.vespa.config.ConfigDefinitionKey;
+import com.yahoo.vespa.config.ConfigPayload;
+import com.yahoo.vespa.config.ConfigPayloadBuilder;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -14,7 +14,6 @@ import java.util.Set;
  * how the user configs are stored, and defines the methods to retrieve user configs and merge the repo with others.
  *
  * @author Ulf Lilleengen
- * @since 5.1
  */
 public class UserConfigRepo {
     private final Map<ConfigDefinitionKey, ConfigPayloadBuilder> userConfigsMap;
@@ -46,10 +45,6 @@ public class UserConfigRepo {
         this.userConfigsMap = map;
     }
 
-    public UserConfigRepo(UserConfigRepo userConfigRepo) {
-        this.userConfigsMap = userConfigRepo.userConfigsMap;
-    }
-
     public ConfigPayloadBuilder get(ConfigDefinitionKey key) {
         return userConfigsMap.get(key);
     }
diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/Host.java b/config-model/src/main/java/com/yahoo/config/model/provision/Host.java
index 8c8debbae43..c8d92220db3 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/Host.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/Host.java
@@ -5,7 +5,6 @@ import com.google.common.collect.ImmutableList;
 import com.yahoo.component.Version;
 import com.yahoo.config.provision.Flavor;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
index b381a5f28db..60435decb04 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
@@ -341,7 +341,7 @@ public class MockApplicationPackage implements ApplicationPackage {
         }
 
         @Override
-        public Reader createReader() throws FileNotFoundException {
+        public Reader createReader() {
             try {
                 if ( ! exists()) throw new FileNotFoundException("File '" + file + "' does not exist");
                 return IOUtils.createReader(file, "UTF-8");
@@ -352,7 +352,7 @@ public class MockApplicationPackage implements ApplicationPackage {
         }
 
         @Override
-        public InputStream createInputStream() throws FileNotFoundException {
+        public InputStream createInputStream() {
             try {
                 if ( ! exists()) throw new FileNotFoundException("File '" + file + "' does not exist");
                 return new BufferedInputStream(new FileInputStream(file));
diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java b/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
index 13d4064f55f..74ab4504136 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/MockRoot.java
@@ -7,7 +7,6 @@ import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.ConfigModelContext;
 import com.yahoo.config.model.ConfigModelRepo;
 import com.yahoo.config.model.api.HostProvisioner;
-import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.model.builder.xml.XmlHelper;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
index d738929f721..7a34ff258b7 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/RankProfile.java
@@ -20,7 +20,6 @@ import com.yahoo.searchlib.rankingexpression.evaluation.TensorValue;
 import com.yahoo.searchlib.rankingexpression.evaluation.Value;
 import com.yahoo.searchlib.rankingexpression.rule.ReferenceNode;
 import com.yahoo.tensor.TensorType;
-import com.yahoo.tensor.evaluation.TypeContext;
 import com.yahoo.vespa.model.VespaModel;
 
 import java.io.File;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java
index 6481d42446f..bf1939e2c3d 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/SearchBuilder.java
@@ -8,7 +8,6 @@ import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.document.DocumentTypeManager;
 import com.yahoo.io.IOUtils;
 import com.yahoo.io.reader.NamedReader;
-import com.yahoo.search.query.profile.QueryProfile;
 import com.yahoo.search.query.profile.QueryProfileRegistry;
 import com.yahoo.search.query.profile.config.QueryProfileXMLReader;
 import com.yahoo.searchdefinition.derived.SearchOrderer;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java
index a807cc79d95..ed09a95b4f4 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java
@@ -11,7 +11,6 @@ import com.yahoo.vespa.documentmodel.SummaryField;
 import com.yahoo.search.config.IndexInfoConfig;
 
 import java.util.*;
-import java.util.stream.Stream;
 
 /**
  * Per-index commands which should be applied to queries prior to searching
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java
index dc6c17e425e..94d475cf519 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexingScript.java
@@ -4,7 +4,6 @@ package com.yahoo.searchdefinition.derived;
 import com.yahoo.document.DataType;
 import com.yahoo.document.PositionDataType;
 import com.yahoo.searchdefinition.Search;
-import com.yahoo.searchdefinition.document.Attribute;
 import com.yahoo.searchdefinition.document.ImmutableSDField;
 import com.yahoo.vespa.configdefinition.IlscriptsConfig;
 import com.yahoo.vespa.configdefinition.IlscriptsConfig.Ilscript.Builder;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java
index f88da34428d..78400666c36 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/SummaryClass.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition.derived;
 
-import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.document.DataType;
 import com.yahoo.prelude.fastsearch.DocsumDefinitionSet;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java
index b7b796d8976..e3bbf78ec21 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/validation/Validator.java
@@ -4,8 +4,6 @@ package com.yahoo.searchdefinition.derived.validation;
 import com.yahoo.searchdefinition.Search;
 import com.yahoo.searchdefinition.derived.DerivedConfiguration;
 
-import java.util.logging.Logger;
-
 /**
  * @author mathiasm
  */
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java
index cae9b20b7b5..6df8a7998a6 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/RankType.java
@@ -1,11 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition.document;
 
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Set;
-
 /**
  * The rank type of a field. For now this is just a container of a string name.
  * This class is immutable.
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java
index 630c8644eb1..c76b8536ea0 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/expressiontransforms/RankProfileTransformContext.java
@@ -3,9 +3,7 @@ package com.yahoo.searchdefinition.expressiontransforms;
 
 import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels;
 import com.yahoo.search.query.profile.QueryProfileRegistry;
-import com.yahoo.searchdefinition.MapEvaluationTypeContext;
 import com.yahoo.searchdefinition.RankProfile;
-import com.yahoo.searchlib.rankingexpression.Reference;
 import com.yahoo.searchlib.rankingexpression.evaluation.Value;
 import com.yahoo.searchlib.rankingexpression.transform.TransformContext;
 
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java
index 59dc4275e15..f0575f1f70f 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddAttributeTransformToSummaryOfImportedFields.java
@@ -6,11 +6,9 @@ import com.yahoo.searchdefinition.RankProfileRegistry;
 import com.yahoo.searchdefinition.Search;
 import com.yahoo.searchdefinition.document.ImmutableImportedComplexSDField;
 import com.yahoo.searchdefinition.document.ImmutableSDField;
-import com.yahoo.searchdefinition.document.ImportedComplexField;
 import com.yahoo.vespa.documentmodel.SummaryField;
 import com.yahoo.vespa.documentmodel.SummaryTransform;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
-import com.yahoo.searchdefinition.document.ImmutableImportedSDField;
 
 import java.util.stream.Stream;
 
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java
index 6e089d6155b..e8c958f9609 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFields.java
@@ -8,18 +8,13 @@ import com.yahoo.document.PositionDataType;
 import com.yahoo.searchdefinition.RankProfileRegistry;
 import com.yahoo.searchdefinition.Search;
 import com.yahoo.searchdefinition.document.Attribute;
-import com.yahoo.searchdefinition.document.ImmutableImportedSDField;
 import com.yahoo.searchdefinition.document.ImmutableSDField;
-import com.yahoo.searchdefinition.document.ImportedField;
 import com.yahoo.vespa.documentmodel.DocumentSummary;
 import com.yahoo.vespa.documentmodel.SummaryField;
 import com.yahoo.vespa.documentmodel.SummaryField.Source;
 import com.yahoo.vespa.documentmodel.SummaryTransform;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 
-import java.util.LinkedList;
-import java.util.List;
-
 /*
  * Adjusts position summary fields by adding derived summary fields (.distance and .position) and setting summary
  * transform and source.
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingInputs.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingInputs.java
index b0129c0a836..fbe04881ce1 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingInputs.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/IndexingInputs.java
@@ -4,7 +4,6 @@ package com.yahoo.searchdefinition.processing;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.searchdefinition.RankProfileRegistry;
 import com.yahoo.searchdefinition.Search;
-import com.yahoo.searchdefinition.document.SDDocumentType;
 import com.yahoo.searchdefinition.document.SDField;
 import com.yahoo.vespa.indexinglanguage.ExpressionConverter;
 import com.yahoo.vespa.indexinglanguage.ExpressionVisitor;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java
index cd75f1f8df7..483fe2105a3 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/multifieldresolver/StemmingResolver.java
@@ -2,14 +2,9 @@
 package com.yahoo.searchdefinition.processing.multifieldresolver;
 
 import com.yahoo.config.application.api.DeployLogger;
-import com.yahoo.language.Linguistics;
-import com.yahoo.searchdefinition.Index;
 import com.yahoo.searchdefinition.Search;
 import com.yahoo.searchdefinition.document.SDField;
 import com.yahoo.searchdefinition.document.Stemming;
-import com.yahoo.searchdefinition.processing.BuiltInFieldSets;
-import com.yahoo.vespa.indexinglanguage.expressions.*;
-import com.yahoo.vespa.indexinglanguage.linguistics.AnnotatorConfig;
 
 import java.util.List;
 import java.util.logging.Level;
diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java
index 5905ee3c3b5..1ff674da439 100644
--- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java
+++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/SearchDef.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.documentmodel;
 
 import com.yahoo.document.DataType;
-import com.yahoo.document.DocumentType;
 import com.yahoo.document.DocumentTypeManager;
 
 import java.util.HashMap;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ConfigProducerRoot.java b/config-model/src/main/java/com/yahoo/vespa/model/ConfigProducerRoot.java
index 2d4b8e9201f..b30aa5aeca6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/ConfigProducerRoot.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/ConfigProducerRoot.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.model;
 
 import com.yahoo.config.ConfigInstance;
-import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.admin.Admin;
 import com.yahoo.vespa.model.filedistribution.FileDistributor;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/Host.java b/config-model/src/main/java/com/yahoo/vespa/model/Host.java
index 1aff926a8c4..a952d63526b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/Host.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/Host.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.model;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.Objects;
 
 import com.yahoo.cloud.config.SentinelConfig;
@@ -68,7 +67,7 @@ public final class Host extends AbstractConfigProducer<AbstractConfigProducer<?>
     }
 
     @Override
-    public void writeFiles(File directory) throws IOException {
+    public void writeFiles(File directory) {
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostPorts.java b/config-model/src/main/java/com/yahoo/vespa/model/HostPorts.java
index 225d0bbcb11..69b692e3ad9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostPorts.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostPorts.java
@@ -6,7 +6,6 @@ import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.provision.NetworkPorts;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
index 8b47c03f4a4..6da8df60161 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java
@@ -6,7 +6,6 @@ import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.api.HostInfo;
 import com.yahoo.config.provision.ClusterMembership;
 import com.yahoo.config.provision.Flavor;
-import com.yahoo.config.provision.NetworkPorts;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
@@ -18,7 +17,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 /**
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
index 0dde5c99d4a..09e67ed96cb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java
@@ -8,7 +8,6 @@ import com.yahoo.config.provision.Capacity;
 import com.yahoo.config.provision.ClusterMembership;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.HostSpec;
-import com.yahoo.config.provision.NetworkPorts;
 import com.yahoo.config.provision.ProvisionLogger;
 
 import java.net.UnknownHostException;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
index 03c8055dd12..d31c411a39e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
@@ -119,8 +119,6 @@ public class Admin extends AbstractConfigProducer implements Serializable {
         return configservers;
     }
 
-    public void removeSlobroks() { slobroks.clear(); }
-
     /** Returns an immutable list of the slobroks in this */
     public List<Slobrok> getSlobroks() { return Collections.unmodifiableList(slobroks); }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java
index be3ec8a6a14..25dbd62e647 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/ZooKeepersConfigProvider.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.model.admin;
 
 import com.yahoo.collections.CollectionUtil;
 import com.yahoo.cloud.config.ZookeepersConfig;
-import com.yahoo.config.model.api.ConfigServerSpec;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
index 61a42d1c1a6..8ba85047057 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerCluster.java
@@ -8,7 +8,6 @@ import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.Service;
 import com.yahoo.vespa.model.admin.Configserver;
 import com.yahoo.vespa.model.container.Container;
-import com.yahoo.vespa.model.container.ContainerCluster;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java
index a2275b17233..866f647a351 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/change/ContentClusterRemovalValidator.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.model.application.validation.change;
 
 import com.yahoo.config.model.api.ConfigChangeAction;
-import com.yahoo.documentmodel.NewDocumentType;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.config.application.api.ValidationId;
 import com.yahoo.config.application.api.ValidationOverrides;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java
index 74e3ac581c4..63661104dae 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomV20ClientsBuilder.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.builder.xml.dom;
 
-import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.text.XML;
 import com.yahoo.vespa.model.clients.Clients;
 import org.w3c.dom.Element;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/clients/Clients.java b/config-model/src/main/java/com/yahoo/vespa/model/clients/Clients.java
index 9b33568b61e..10979a21838 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/clients/Clients.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/clients/Clients.java
@@ -4,14 +4,8 @@ package com.yahoo.vespa.model.clients;
 import com.yahoo.vespa.config.content.LoadTypeConfig;
 import com.yahoo.config.model.ConfigModel;
 import com.yahoo.config.model.ConfigModelContext;
-import com.yahoo.config.model.ConfigModelRepo;
-import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.documentapi.messagebus.loadtypes.LoadType;
 import com.yahoo.documentapi.messagebus.loadtypes.LoadTypeSet;
-import com.yahoo.vespa.model.container.ContainerCluster;
-
-import java.util.LinkedList;
-import java.util.List;
 
 /**
  * This is the clients plugin for the Vespa model. It is responsible for creating
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ContainerSubsystem.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ContainerSubsystem.java
index 3b0bb959a7b..3fa4db60195 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ContainerSubsystem.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ContainerSubsystem.java
@@ -1,8 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.container.component;
 
-import com.yahoo.config.model.producer.AbstractConfigProducer;
-import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.component.chain.Chains;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/Servlet.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/Servlet.java
index 011fcb7c3c7..e8d733f26a2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/Servlet.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/Servlet.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.container.component;
 
-import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.jdisc.http.ServletPathsConfig;
 import com.yahoo.osgi.provider.model.ComponentModel;
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/ContainerDocproc.java b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/ContainerDocproc.java
index 57d5c203d32..5a251194d75 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/ContainerDocproc.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/ContainerDocproc.java
@@ -3,13 +3,12 @@ package com.yahoo.vespa.model.container.docproc;
 
 import com.yahoo.collections.Pair;
 import com.yahoo.config.docproc.DocprocConfig;
-import com.yahoo.container.jdisc.config.SessionConfig;
-import com.yahoo.container.jdisc.ContainerMbusConfig;
 import com.yahoo.config.docproc.SchemamappingConfig;
+import com.yahoo.container.jdisc.ContainerMbusConfig;
+import com.yahoo.container.jdisc.config.SessionConfig;
 import com.yahoo.docproc.jdisc.messagebus.MbusRequestContext;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.component.ContainerSubsystem;
-import com.yahoo.vespa.model.container.component.chain.ProcessingHandler;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
 import java.util.HashMap;
@@ -18,7 +17,6 @@ import java.util.Map;
 /**
  * @author einarmr
  * @author gjoranv
- * @since 5.1.9
  */
 public class ContainerDocproc extends ContainerSubsystem<DocprocChains>
         implements 
@@ -70,18 +68,10 @@ public class ContainerDocproc extends ContainerSubsystem<DocprocChains>
         return preferLocalNode;
     }
 
-    public void setPreferLocalNode(boolean preferLocalNode) {
-        this.preferLocalNode = preferLocalNode;
-    }
-
     public int getNumNodesPerClient() {
         return numNodesPerClient;
     }
 
-    public void setNumNodesPerClient(int numNodesPerClient) {
-        this.numNodesPerClient = numNodesPerClient;
-    }
-
     @Override
     public void getConfig(ContainerMbusConfig.Builder builder) {
         builder.maxpendingcount(getMaxMessagesInQueue());
@@ -116,10 +106,6 @@ public class ContainerDocproc extends ContainerSubsystem<DocprocChains>
         }
     }
     
-    public ProcessingHandler<DocprocChains> getDocprocHandler() {
-        return getChains().getDocprocHandler();
-    }
-
     @Override
     public void getConfig(SchemamappingConfig.Builder builder) {
         Map<Pair<String, String>, String> allMappings = new HashMap<>();
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocumentProcessor.java b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocumentProcessor.java
index 92b636ed48b..62ea405179a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocumentProcessor.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocumentProcessor.java
@@ -5,9 +5,6 @@ import com.yahoo.collections.Pair;
 import com.yahoo.vespa.model.container.component.chain.ChainedComponent;
 import com.yahoo.vespa.model.container.docproc.model.DocumentProcessorModel;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java
index 9a67871e683..a03c5e1ec42 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/Http.java
@@ -86,7 +86,7 @@ public class Http extends AbstractConfigProducer<AbstractConfigProducer<?>> impl
     }
 
     @Override
-    public void validate() throws Exception {
+    public void validate() {
         validate(bindings);
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java
index 3ad6484aaec..efae7278b14 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/processing/Processor.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.model.container.processing;
 
 import com.yahoo.component.chain.model.ChainedComponentModel;
-import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.vespa.model.container.component.chain.ChainedComponent;
 
 /**
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
index d2f7c5e4549..f1e081f4304 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
@@ -6,7 +6,6 @@ import com.yahoo.osgi.provider.model.ComponentModel;
 import com.yahoo.prelude.fastsearch.FS4ResourcePool;
 import com.yahoo.prelude.semantics.SemanticRulesConfig;
 import com.yahoo.vespa.model.container.ApplicationContainerCluster;
-import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.ContainerSubsystem;
 import com.yahoo.vespa.model.container.search.searchchain.LocalProvider;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java
index c7114178ad6..2e95f02f260 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java
@@ -14,7 +14,6 @@ import java.io.Serializable;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.logging.Level;
-import java.util.stream.Collectors;
 
 /**
  * Owns the query profiles and query profile types to be handed to the qrs nodes.
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfilesBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfilesBuilder.java
index b832c1bbdcd..b653b0acf8d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfilesBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfilesBuilder.java
@@ -6,7 +6,6 @@ import com.yahoo.io.reader.NamedReader;
 import com.yahoo.search.query.profile.config.QueryProfileXMLReader;
 import com.yahoo.config.application.api.ApplicationPackage;
 
-import java.util.Collections;
 import java.util.List;
 
 /**
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
index cb1d94717f6..aa820d1d898 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java
@@ -85,7 +85,7 @@ public class LocalProvider extends Provider implements
         }
     }
 
-    private void addProviderSearchers(LocalProviderSpec providerSpec) {
+    private void addProviderSearchers() {
         for (ChainedComponentModel searcherModel : LocalProviderSpec.searcherModels) {
             addInnerComponent(new Searcher<>(searcherModel));
         }
@@ -130,7 +130,7 @@ public class LocalProvider extends Provider implements
                          FederationOptions federationOptions,
                          LocalProviderSpec providerSpec) {
         super(specWithoutInnerSearchers, federationOptions);
-        addProviderSearchers(providerSpec);
+        addProviderSearchers();
         this.providerSpec = providerSpec;
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 672ee0bb161..2bfb1da9dcb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -79,7 +79,6 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
-import java.util.logging.Level;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java
index dc9372c463b..d25396c6a50 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentNode.java
@@ -1,10 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.content;
 
-import com.yahoo.config.provision.Flavor;
 import com.yahoo.metrics.MetricsmanagerConfig;
 import com.yahoo.vespa.config.content.LoadTypeConfig;
-import com.yahoo.vespa.config.content.StorFilestorConfig;
 import com.yahoo.vespa.config.content.core.StorCommunicationmanagerConfig;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.vespa.config.content.core.StorStatusConfig;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ResourceLimits.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ResourceLimits.java
index 67e5dcdd0ee..12ebde2276a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ResourceLimits.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ResourceLimits.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.model.content;
 
 import com.yahoo.vespa.config.search.core.ProtonConfig;
-import com.yahoo.vespa.defaults.Defaults;
 
 import java.util.Optional;
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java
index ff3b4891146..c02f8b2b737 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/engines/ProtonProvider.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.model.content.engines;
 
 import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.vespa.model.content.StorageNode;
-import com.yahoo.vespa.model.search.SearchNode;
 
 /**
  * @author baldersheim
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/IntegrityCheckerProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/IntegrityCheckerProducer.java
index 46d621981d4..4fa117ad9e7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/IntegrityCheckerProducer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/IntegrityCheckerProducer.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.model.content.storagecluster;
 
 import com.yahoo.vespa.config.content.core.StorIntegritycheckerConfig;
-import com.yahoo.config.model.ConfigModelUtils;
 import com.yahoo.vespa.model.builder.xml.dom.ModelElement;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 
@@ -21,9 +20,6 @@ public class IntegrityCheckerProducer implements StorIntegritycheckerConfig.Prod
     private Integer stopTime;
     private String weeklyCycle;
 
-    IntegrityCheckerProducer() {
-    }
-
     IntegrityCheckerProducer(Integer startTime, Integer stopTime, String weeklyCycle) {
         this.startTime = startTime;
         this.stopTime = stopTime;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
index e12cc60b041..3e70ac4705e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
@@ -31,7 +31,6 @@ import com.yahoo.searchlib.rankingexpression.rule.ReferenceNode;
 import com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode;
 import com.yahoo.tensor.Tensor;
 import com.yahoo.tensor.TensorType;
-import com.yahoo.tensor.evaluation.TypeContext;
 import com.yahoo.tensor.functions.Generate;
 import com.yahoo.tensor.functions.Join;
 import com.yahoo.tensor.functions.Reduce;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java b/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java
index b29ed0fc25b..74b9e7309c8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/DocumentDatabase.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.model.search;
 
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 import com.yahoo.search.config.IndexInfoConfig;
-import com.yahoo.searchdefinition.RankingConstant;
 import com.yahoo.searchdefinition.derived.DerivedConfiguration;
 import com.yahoo.vespa.config.search.AttributesConfig;
 import com.yahoo.vespa.config.search.ImportedFieldsConfig;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java
index df5f2e844af..df44a429f9c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.search;
 
-import com.yahoo.collections.Pair;
 import com.yahoo.component.ComponentId;
 import com.yahoo.component.ComponentSpecification;
 import com.yahoo.component.chain.Phase;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingProcessor.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingProcessor.java
index a23191e7689..d3d2c8873eb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingProcessor.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingProcessor.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.search;
 
-import com.yahoo.collections.Pair;
 import com.yahoo.container.bundle.BundleInstantiationSpecification;
 import com.yahoo.component.ComponentId;
 import com.yahoo.component.ComponentSpecification;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchColumn.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchColumn.java
deleted file mode 100644
index b45db0d1dc3..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchColumn.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.search;
-
-import com.yahoo.config.model.producer.AbstractConfigProducer;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author Simon Thoresen Hult
- */
-public class SearchColumn extends AbstractConfigProducer {
-
-    // All search nodes contained in this column, these also exist as child config producers.
-    private final List<SearchNode> nodes = new LinkedList<>();
-
-    public SearchColumn(SearchCluster parent, String name, int index) {
-        super(parent, name);
-    }
-
-    /** @return The number of rows in this column. */
-    public int getNumRows() { return nodes.size(); }
-
-    /** @return All search nodes contained in this column. */
-    public List<SearchNode> getSearchNodes() { return nodes; }
-
-}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/utils/Duration.java b/config-model/src/main/java/com/yahoo/vespa/model/utils/Duration.java
index 0b1e23510fe..c55316186d2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/utils/Duration.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/utils/Duration.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.model.utils;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
index 8995fcbca99..46d41b1e0b0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/utils/FileSender.java
@@ -20,8 +20,6 @@ import java.util.*;
  */
 public class FileSender implements Serializable {
 
-    public enum FileType {FILE, URI};
-
     /**
      * Send the given file to all given services.
      *
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java
index fe64a69b311..ab321ac5835 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java
@@ -48,8 +48,4 @@ public class ApplicationPackageTester {
         return new ApplicationPackageTester(applicationPackageDir, true);
     }
 
-    public static ApplicationPackageTester createWithoutValidation(String applicationPackageDir) {
-        return new ApplicationPackageTester(applicationPackageDir, false);
-    }
-
 }
diff --git a/config-model/src/test/java/com/yahoo/config/model/MapConfigModelRegistryTest.java b/config-model/src/test/java/com/yahoo/config/model/MapConfigModelRegistryTest.java
index 93d71bb3f43..9847ad09198 100644
--- a/config-model/src/test/java/com/yahoo/config/model/MapConfigModelRegistryTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/MapConfigModelRegistryTest.java
@@ -6,7 +6,6 @@ import com.yahoo.config.model.builder.xml.ConfigModelId;
 import org.junit.Test;
 import org.w3c.dom.Element;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
diff --git a/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java b/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java
index 8fa2d1e5e76..ac776d3cf78 100644
--- a/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java
@@ -6,14 +6,11 @@ import com.yahoo.vespa.model.container.Container;
 import com.yahoo.vespa.model.container.ApplicationContainer;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg;
 import org.junit.Test;
-import org.xml.sax.SAXException;
 
-import java.io.IOException;
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Tests that qrserver is assigned port Defaults.getDefaults().vespaWebServicePort() even if there is a HTTP gateway configured earlier in
@@ -24,7 +21,7 @@ import static org.junit.Assert.assertTrue;
 public class QrserverAndGatewayPortAllocationTest {
 
     @Test
-    public void testPorts() throws IOException, SAXException {
+    public void testPorts() {
         String appDir = "src/test/cfg/application/app_qrserverandgw/";
         VespaModelCreatorWithFilePkg creator = new VespaModelCreatorWithFilePkg(appDir);
         VespaModel vespaModel = creator.create();
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
index 19d7def5787..1c7925b935a 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java
@@ -127,7 +127,6 @@ public class HostsXmlProvisionerTest {
 
     @Test
     public void require_singlenode_HostAlias_is_used_if_hosts_xml() {
-        String servicesXml = "<container id='default' version='1.0' />";
         HostsXmlProvisioner hostProvisioner = createProvisioner(oneHost);
         HostSpec hostSpec = hostProvisioner.allocateHost(Container.SINGLENODE_CONTAINER_SERVICESPEC);
         assertThat(hostSpec.hostname(), is("test1.yahoo.com"));
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index dc0312aef8e..578aa82376b 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -14,7 +14,6 @@ import com.yahoo.config.provision.Zone;
 import com.yahoo.config.provisioning.FlavorsConfig;
 import com.yahoo.container.core.ApplicationMetadataConfig;
 import com.yahoo.search.config.QrStartConfig;
-import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.config.search.core.ProtonConfig;
 import com.yahoo.vespa.model.HostResource;
 import com.yahoo.vespa.model.HostSystem;
@@ -609,7 +608,7 @@ public class ModelProvisioningTest {
     }
 
     @Test
-    public void testClusterControllersCanSupplementWithAllContainerClusters() throws ParseException {
+    public void testClusterControllersCanSupplementWithAllContainerClusters() {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
                 "<services>" +
@@ -1029,7 +1028,7 @@ public class ModelProvisioningTest {
     }
 
     @Test
-    public void testUsingNodesAndGroupCountAttributesAndGettingJustOneNode() throws ParseException {
+    public void testUsingNodesAndGroupCountAttributesAndGettingJustOneNode() {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
                         "<services>" +
@@ -1069,7 +1068,7 @@ public class ModelProvisioningTest {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void testRequiringMoreNodesThanAreAvailable() throws ParseException {
+    public void testRequiringMoreNodesThanAreAvailable() {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
                 "<services>" +
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java
index 9942b563297..ee509e87712 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/FieldOfTypeDocumentTestCase.java
@@ -4,7 +4,6 @@ package com.yahoo.searchdefinition;
 import com.yahoo.document.*;
 import com.yahoo.document.config.DocumentmanagerConfig;
 import com.yahoo.searchdefinition.derived.Deriver;
-import com.yahoo.searchdefinition.parser.ParseException;
 import org.junit.Test;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -19,7 +18,7 @@ import static org.junit.Assert.assertSame;
 public class FieldOfTypeDocumentTestCase extends SearchDefinitionTestCase {
 
     @Test
-    public void testDocument() throws IOException, ParseException {
+    public void testDocument() throws IOException {
 
         List<String> sds = new ArrayList<>();
         sds.add("src/test/examples/music.sd");
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java
index 5b8b05e51da..16c6b070551 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectRankingExpressionFileRefTestCase.java
@@ -10,7 +10,6 @@ import org.junit.Test;
 
 import java.io.IOException;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java
index 627394bb6ea..c145c0e5634 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/IncorrectSummaryTypesTestCase.java
@@ -4,8 +4,6 @@ package com.yahoo.searchdefinition;
 import com.yahoo.searchdefinition.parser.ParseException;
 import org.junit.Test;
 
-import java.io.IOException;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 /**
@@ -15,7 +13,7 @@ import static org.junit.Assert.fail;
  */
 public class IncorrectSummaryTypesTestCase extends SearchDefinitionTestCase {
     @Test
-    public void testImportingIncorrect() throws IOException, ParseException {
+    public void testImportingIncorrect() throws ParseException {
         try {
             SearchBuilder.createFromString(
                     "search incorrectsummarytypes {\n" +
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/NameFieldCheckTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/NameFieldCheckTestCase.java
index b539c65150d..d2360453976 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/NameFieldCheckTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/NameFieldCheckTestCase.java
@@ -1,11 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition;
 
-import com.yahoo.searchdefinition.parser.ParseException;
 import org.junit.Test;
 
-import java.io.IOException;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -20,7 +17,7 @@ import static org.junit.Assert.fail;
 public class NameFieldCheckTestCase extends SearchDefinitionTestCase {
 
     @Test
-    public void testNameField() throws IOException, ParseException {
+    public void testNameField() {
         try {
             SearchBuilder.createFromString(
                     "search simple {\n" +
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java
index ed4760e2432..5ac37bf0a3a 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/OutsideTestCase.java
@@ -2,7 +2,6 @@
 package com.yahoo.searchdefinition;
 
 import com.yahoo.searchdefinition.parser.ParseException;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java
index aa4515e4044..51508414205 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java
@@ -13,7 +13,6 @@ import org.junit.Test;
 import java.util.List;
 
 import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
 
 /**
  * @author bratseth
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java
index 55f0fdd19ac..c0a90b6aaa1 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java
@@ -13,7 +13,6 @@ import java.util.Optional;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 /**
  * @author bratseth
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java
index 57d897498a5..0107331fe68 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionValidationTestCase.java
@@ -8,7 +8,6 @@ import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels;
 import com.yahoo.yolean.Exceptions;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 /**
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionTestCase.java
index 21c7362f793..a6c6939f830 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionTestCase.java
@@ -5,12 +5,10 @@ import com.yahoo.io.IOUtils;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
-import java.io.File;
 import java.io.IOException;
 
 import static helpers.CompareConfigTestHelper.assertSerializedConfigEquals;
 import static helpers.CompareConfigTestHelper.assertSerializedConfigFileEquals;
-import static org.junit.Assert.assertEquals;
 
 public abstract class SearchDefinitionTestCase {
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionsParsingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionsParsingTestCase.java
index a26154fc8da..fda15528eda 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionsParsingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionsParsingTestCase.java
@@ -2,14 +2,9 @@
 package com.yahoo.searchdefinition;
 
 import java.io.IOException;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
 
 import com.yahoo.searchdefinition.parser.ParseException;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java
index 3d98ce46de7..001ad64e2da 100755
--- a/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java
@@ -17,7 +17,7 @@ import static org.junit.Assert.fail;
 public class StructTestCase extends SearchDefinitionTestCase {
 
     @Test
-    public void testStruct() throws IOException, ParseException {
+    public void testStruct() throws IOException {
         assertConfigFile("src/test/examples/structresult.cfg",
                          new DocumentmanagerConfig(Deriver.getDocumentManagerConfig("src/test/examples/struct.sd")).toString() + "\n");
     }
@@ -33,7 +33,7 @@ public class StructTestCase extends SearchDefinitionTestCase {
     }
 
     @Test
-    public void testStructAndDocumentWithSameNames() throws IOException, ParseException {
+    public void testStructAndDocumentWithSameNames() {
         try {
             DocumenttypesConfig.Builder dt = Deriver.getDocumentTypesConfig("src/test/examples/structanddocumentwithsamenames.sd");
         } catch (Exception e) {
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java
index 7e6eaa0683a..f94ac1c285c 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java
@@ -1,11 +1,9 @@
 package com.yahoo.searchdefinition;
 
-import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.model.test.utils.DeployLoggerStub;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.util.logging.Level;
 
 import static org.junit.Assert.assertEquals;
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
index 7fbca88cb61..78382ccdad6 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
@@ -3,7 +3,6 @@ package com.yahoo.searchdefinition.derived;
 
 import com.yahoo.document.DocumenttypesConfig;
 import com.yahoo.document.config.DocumentmanagerConfig;
-import com.yahoo.search.query.profile.QueryProfileRegistry;
 import com.yahoo.searchdefinition.Search;
 import com.yahoo.searchdefinition.SearchBuilder;
 import com.yahoo.searchdefinition.SearchDefinitionTestCase;
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java
index 47915580017..cc27a0d6067 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/DeriverTestCase.java
@@ -4,19 +4,12 @@ package com.yahoo.searchdefinition.derived;
 import com.yahoo.document.DataType;
 import com.yahoo.document.DocumentTypeManager;
 import com.yahoo.document.config.DocumentmanagerConfig;
-import com.yahoo.io.IOUtils;
-import com.yahoo.searchdefinition.SearchBuilder;
 import com.yahoo.searchdefinition.SearchDefinitionTestCase;
-import com.yahoo.searchdefinition.document.SDDocumentType;
 import org.junit.Test;
-import java.io.File;
-import java.io.IOException;
+
 import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
+
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Tests deriving using the Deriver facade
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
index 4600f6ae4c6..ebd2c752d5e 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
@@ -2,7 +2,6 @@
 package com.yahoo.searchdefinition.derived;
 
 import com.yahoo.searchdefinition.parser.ParseException;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
index 8ad6abbbb42..9b363bc5734 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
@@ -16,7 +16,6 @@ import org.junit.Test;
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
 
 import org.junit.rules.TemporaryFolder;
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java
index 1be9ee3f465..592fd6c45ed 100755
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/StreamingStructTestCase.java
@@ -4,9 +4,7 @@ package com.yahoo.searchdefinition.derived;
 import com.yahoo.searchdefinition.parser.ParseException;
 import org.junit.Test;
 
-import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 
 /**
  * Tests VSM configuration deriving for structs
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TwoStreamingStructsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/TwoStreamingStructsTestCase.java
index 179aced3540..a70877a4f4f 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/TwoStreamingStructsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/TwoStreamingStructsTestCase.java
@@ -3,7 +3,6 @@ package com.yahoo.searchdefinition.derived;
 
 import com.yahoo.searchdefinition.SearchBuilder;
 import com.yahoo.searchdefinition.parser.ParseException;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java
index a385ed09809..e230840bcaa 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/AdjustPositionSummaryFieldsTestCase.java
@@ -1,20 +1,9 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition.processing;
 
-import com.google.common.collect.ImmutableMap;
-import com.yahoo.config.application.api.ApplicationPackage;
-import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.document.DataType;
 import com.yahoo.document.PositionDataType;
-import com.yahoo.document.ReferenceDataType;
-import com.yahoo.document.TemporaryStructuredDataType;
-import com.yahoo.searchdefinition.DocumentReference;
-import com.yahoo.searchdefinition.DocumentReferences;
 import com.yahoo.searchdefinition.Search;
-import com.yahoo.searchdefinition.document.SDDocumentType;
-import com.yahoo.searchdefinition.document.SDField;
-import com.yahoo.searchdefinition.document.TemporaryImportedField;
-import com.yahoo.searchdefinition.document.TemporarySDField;
 import com.yahoo.vespa.documentmodel.DocumentSummary;
 import com.yahoo.vespa.documentmodel.SummaryField;
 import com.yahoo.vespa.documentmodel.SummaryTransform;
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java
index 3e3cd932e55..c679bb7e61f 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java
@@ -1,27 +1,16 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition.processing;
 
-import com.google.common.collect.ImmutableMap;
-import com.yahoo.config.application.api.ApplicationPackage;
-import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.document.DataType;
-import com.yahoo.document.ReferenceDataType;
-import com.yahoo.document.TemporaryStructuredDataType;
 import com.yahoo.document.TensorDataType;
-import com.yahoo.searchdefinition.DocumentReference;
-import com.yahoo.searchdefinition.DocumentReferences;
 import com.yahoo.searchdefinition.Search;
 import com.yahoo.searchdefinition.document.ImmutableImportedSDField;
 import com.yahoo.searchdefinition.document.ImmutableSDField;
 import com.yahoo.searchdefinition.document.ImportedField;
 import com.yahoo.searchdefinition.document.ImportedFields;
-import com.yahoo.searchdefinition.document.SDDocumentType;
 import com.yahoo.searchdefinition.document.SDField;
-import com.yahoo.searchdefinition.document.TemporaryImportedField;
 import com.yahoo.searchdefinition.document.TemporarySDField;
 import com.yahoo.tensor.TensorType;
-import com.yahoo.vespa.documentmodel.DocumentSummary;
-import com.yahoo.vespa.documentmodel.SummaryField;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValidationTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValidationTestCase.java
index ad801ed50ab..3eeac1ee710 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValidationTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValidationTestCase.java
@@ -4,7 +4,6 @@ package com.yahoo.searchdefinition.processing;
 import com.yahoo.searchdefinition.SearchBuilder;
 import com.yahoo.searchdefinition.derived.AbstractExportingTestCase;
 import com.yahoo.searchdefinition.parser.ParseException;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValuesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValuesTestCase.java
index 8d3f1ba0020..a1c454da822 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValuesTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/IndexingValuesTestCase.java
@@ -2,7 +2,6 @@
 package com.yahoo.searchdefinition.processing;
 
 import com.yahoo.searchdefinition.parser.ParseException;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java
index 9cf555e2c9a..e5fadea6dd8 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/PositionTestCase.java
@@ -7,14 +7,11 @@ import com.yahoo.searchdefinition.Search;
 import com.yahoo.searchdefinition.SearchBuilder;
 import com.yahoo.searchdefinition.document.Attribute;
 import com.yahoo.searchdefinition.document.FieldSet;
-import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.documentmodel.SummaryField;
 import com.yahoo.vespa.documentmodel.SummaryTransform;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.Iterator;
 
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedRankingExpressionFunctionNamesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedRankingExpressionFunctionNamesTestCase.java
index b39c48b67bf..eecab3c03d7 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedRankingExpressionFunctionNamesTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedRankingExpressionFunctionNamesTestCase.java
@@ -3,7 +3,6 @@ package com.yahoo.searchdefinition.processing;
 
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.searchdefinition.RankProfileRegistry;
-import com.yahoo.searchdefinition.Search;
 import com.yahoo.searchdefinition.SearchBuilder;
 import com.yahoo.searchdefinition.parser.ParseException;
 import org.junit.Test;
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java
index 15c1d24ce33..f90320ad686 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/TensorTransformTestCase.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 public class TensorTransformTestCase extends SearchDefinitionTestCase {
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/WeightedSetSummaryToTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/WeightedSetSummaryToTestCase.java
index bee353692b8..ef6bc57223d 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/WeightedSetSummaryToTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/WeightedSetSummaryToTestCase.java
@@ -5,12 +5,10 @@ import com.yahoo.searchdefinition.Search;
 import com.yahoo.searchdefinition.SearchBuilder;
 import com.yahoo.searchdefinition.SearchDefinitionTestCase;
 import com.yahoo.searchdefinition.parser.ParseException;
-import com.yahoo.vespa.documentmodel.DocumentSummary;
 import org.junit.Test;
 
 import java.io.IOException;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 /** @author bratseth */
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/HostPortsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/HostPortsTest.java
index e2834291c0d..1ded447993c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/HostPortsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/HostPortsTest.java
@@ -11,12 +11,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author arnej
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java b/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
index 3e9bb6d0615..02b77bdb375 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/HostResourceTest.java
@@ -14,7 +14,6 @@ import static com.yahoo.config.provision.ClusterSpec.Type.admin;
 import static com.yahoo.config.provision.ClusterSpec.Type.container;
 import static com.yahoo.config.provision.ClusterSpec.Type.content;
 import static org.hamcrest.Matchers.endsWith;
-import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/InstanceResolverTest.java b/config-model/src/test/java/com/yahoo/vespa/model/InstanceResolverTest.java
index 0f58c5e3a2a..c96e28035e0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/InstanceResolverTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/InstanceResolverTest.java
@@ -56,7 +56,6 @@ public class InstanceResolverTest {
 
     /**
      * Values unset on builder, trying to set them from def file, but type mismatches there
-     * @throws Exception
      */
     @Test
     public void testApplyDefToBuilderMismatches() throws Exception {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java
index 1c640a6e4d7..c88d91a3ede 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java
@@ -95,7 +95,7 @@ public class ClusterControllerTestCase extends DomBuilderTest {
 
 
     @Test(expected = IllegalArgumentException.class)
-    public void testSeparateHostsRequired() throws Exception {
+    public void testSeparateHostsRequired() {
         String xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n" +
                 "<services>\n" +
                 "\n" +
@@ -122,7 +122,7 @@ public class ClusterControllerTestCase extends DomBuilderTest {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void testSeparateHostsFromConfigServerRequired() throws Exception {
+    public void testSeparateHostsFromConfigServerRequired() {
         String xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n" +
                 "<services>\n" +
                 "\n" +
@@ -150,7 +150,7 @@ public class ClusterControllerTestCase extends DomBuilderTest {
     }
 
     @Test
-    public void testStandaloneZooKeeper() throws Exception {
+    public void testStandaloneZooKeeper() {
         String xml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n" +
                 "<services>\n" +
                 "\n" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
index ac76783c2af..be7fc19a429 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
@@ -5,7 +5,6 @@ import com.yahoo.cloud.config.LogforwarderConfig;
 import com.yahoo.cloud.config.SentinelConfig;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.NullConfigModelRegistry;
-import com.yahoo.config.model.api.container.ContainerServiceType;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.config.model.provision.Hosts;
@@ -27,7 +26,6 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static com.yahoo.config.model.api.container.ContainerServiceType.CONTAINER;
 import static com.yahoo.config.model.api.container.ContainerServiceType.LOGSERVER_CONTAINER;
 import static com.yahoo.config.model.api.container.ContainerServiceType.METRICS_PROXY_CONTAINER;
 import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
index ad6a7de935b..5fe62e6bd1b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
@@ -9,8 +9,6 @@ import ai.vespa.metricsproxy.metric.dimensions.ApplicationDimensionsConfig;
 import ai.vespa.metricsproxy.metric.dimensions.NodeDimensionsConfig;
 import ai.vespa.metricsproxy.rpc.RpcConnectorConfig;
 import ai.vespa.metricsproxy.service.VespaServicesConfig;
-import com.yahoo.config.provision.Flavor;
-import com.yahoo.config.provisioning.FlavorsConfig;
 import com.yahoo.search.config.QrStartConfig;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.admin.monitoring.Metric;
@@ -20,7 +18,6 @@ import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.T
 import static com.yahoo.vespa.model.admin.metricsproxy.MetricsProxyModelTester.TestMode.self_hosted;
 import static com.yahoo.vespa.model.admin.monitoring.DefaultPublicConsumer.DEFAULT_PUBLIC_CONSUMER_ID;
 import static com.yahoo.vespa.model.admin.monitoring.VespaMetricsConsumer.VESPA_CONSUMER_ID;
-import static org.junit.Assert.assertEquals;
 
 /**
  * @author gjoranv
@@ -96,9 +93,4 @@ class MetricsProxyModelTester {
         return new RpcConnectorConfig((RpcConnectorConfig.Builder) model.getConfig(new RpcConnectorConfig.Builder(), CONTAINER_CONFIG_ID));
     }
 
-    private static Flavor flavorFromString(String name) {
-        return new Flavor(new FlavorsConfig.Flavor(new FlavorsConfig.Flavor.Builder().
-                name(name)));
-    }
-
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ClusterSizeReductionValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ClusterSizeReductionValidatorTest.java
index bce28dd9236..895aa4f6a36 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ClusterSizeReductionValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ClusterSizeReductionValidatorTest.java
@@ -3,22 +3,13 @@ package com.yahoo.vespa.model.application.validation.change;
 
 import com.yahoo.config.application.api.ValidationId;
 import com.yahoo.config.application.api.ValidationOverrides;
-import com.yahoo.config.model.api.ConfigChangeAction;
-import com.yahoo.config.model.api.ConfigChangeRefeedAction;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.application.validation.ValidationTester;
-import com.yahoo.vespa.model.search.AbstractSearchCluster;
 import com.yahoo.yolean.Exceptions;
 import org.junit.Test;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 /**
@@ -27,7 +18,7 @@ import static org.junit.Assert.fail;
 public class ClusterSizeReductionValidatorTest {
 
     @Test
-    public void testSizeReductionValidation() throws IOException, SAXException {
+    public void testSizeReductionValidation() {
         ValidationTester tester = new ValidationTester(30);
 
         VespaModel previous = tester.deploy(null, getServices(30), Environment.prod, null).getFirst();
@@ -43,7 +34,7 @@ public class ClusterSizeReductionValidatorTest {
     }
 
     @Test
-    public void testSizeReductionValidationMinimalDecreaseIsAllowed() throws IOException, SAXException {
+    public void testSizeReductionValidationMinimalDecreaseIsAllowed() {
         ValidationTester tester = new ValidationTester(30);
 
         VespaModel previous = tester.deploy(null, getServices(3), Environment.prod, null).getFirst();
@@ -61,7 +52,7 @@ public class ClusterSizeReductionValidatorTest {
     */
 
     @Test
-    public void testOverridingSizereductionValidation() throws IOException, SAXException {
+    public void testOverridingSizereductionValidation() {
         ValidationTester tester = new ValidationTester(30);
 
         VespaModel previous = tester.deploy(null, getServices(30), Environment.prod, null).getFirst();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
index eeeb5344e0b..9318130bb4f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ConfigValueChangeValidatorTest.java
@@ -22,7 +22,6 @@ import org.junit.Test;
 
 import java.time.Instant;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/GlobalDocumentChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/GlobalDocumentChangeValidatorTest.java
index 68b21222fc5..465b1a5d3ba 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/GlobalDocumentChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/GlobalDocumentChangeValidatorTest.java
@@ -1,17 +1,10 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.application.validation.change;
 
-import com.yahoo.config.model.api.ConfigChangeAction;
-import com.yahoo.config.model.api.ConfigChangeRefeedAction;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.application.validation.ValidationTester;
 import org.junit.Test;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -23,7 +16,7 @@ import static org.junit.Assert.assertFalse;
 public class GlobalDocumentChangeValidatorTest {
 
     @Test
-    public void testChangGlobalAttribute() throws IOException, SAXException {
+    public void testChangGlobalAttribute() {
         testChangeGlobalAttribute(true, false, false, null);
         testChangeGlobalAttribute(true, true, true, null);
         testChangeGlobalAttribute(false, false, true, null);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
index cca112f3bd2..ab56178bee3 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
@@ -8,9 +8,7 @@ import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.application.validation.ValidationTester;
 import com.yahoo.vespa.model.search.AbstractSearchCluster;
 import org.junit.Test;
-import org.xml.sax.SAXException;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -23,7 +21,7 @@ import static org.junit.Assert.assertTrue;
 public class IndexingModeChangeValidatorTest {
 
     @Test
-    public void testChangingIndexMode() throws IOException, SAXException {
+    public void testChangingIndexMode() {
         ValidationTester tester = new ValidationTester();
 
         VespaModel oldModel =
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidatorTest.java
index c8fe3c46c9a..038fe2c8675 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/AttributeChangeValidatorTest.java
@@ -10,7 +10,6 @@ import java.util.List;
 
 import static com.yahoo.vespa.model.application.validation.change.ConfigChangeTestUtils.newRefeedAction;
 import static com.yahoo.vespa.model.application.validation.change.ConfigChangeTestUtils.newRestartAction;
-import static org.junit.Assert.assertEquals;
 
 public class AttributeChangeValidatorTest {
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentTypeChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentTypeChangeValidatorTest.java
index aeddd05209f..4064e53dfb7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentTypeChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/search/DocumentTypeChangeValidatorTest.java
@@ -180,7 +180,7 @@ public class DocumentTypeChangeValidatorTest {
     }
 
     @Test
-    public void requireThatChangingTargetTypeOfReferenceFieldIsNotOK() throws Exception {
+    public void requireThatChangingTargetTypeOfReferenceFieldIsNotOK() {
         DocumentTypeChangeValidator validator = new DocumentTypeChangeValidator(
                 createDocumentTypeWithReferenceField("oldDoc"),
                 createDocumentTypeWithReferenceField("newDoc"));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java
index d1ef1010b73..f3eeec62cff 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/UserConfigBuilderTest.java
@@ -17,10 +17,8 @@ import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 import javax.xml.parsers.ParserConfigurationException;
-import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.Optional;
@@ -40,7 +38,7 @@ public class UserConfigBuilderTest {
     };
 
     @Test
-    public void require_that_simple_config_is_resolved() throws ParserConfigurationException, IOException, SAXException {
+    public void require_that_simple_config_is_resolved() throws ParserConfigurationException {
         Element configRoot = getDocument("<config name=\"simpletypes\">" +
                                          "    <intval>13</intval>" +
                                          "</config>" +
@@ -62,7 +60,7 @@ public class UserConfigBuilderTest {
 
 
     @Test
-    public void require_that_arrays_config_is_resolved() throws ParserConfigurationException, IOException, SAXException {
+    public void require_that_arrays_config_is_resolved() throws ParserConfigurationException {
         Element configRoot = getDocument("<config name=\"arraytypes\">" +
                 "    <intarr operation=\"append\">13</intarr>" +
                 "    <intarr operation=\"append\">10</intarr>" +
@@ -80,7 +78,7 @@ public class UserConfigBuilderTest {
     }
 
     @Test
-    public void require_that_arrays_of_structs_are_resolved() throws ParserConfigurationException, IOException, SAXException {
+    public void require_that_arrays_of_structs_are_resolved() throws ParserConfigurationException {
         Element configRoot = getDocument(
                 "  <config name='vespa.configdefinition.specialtokens'>" +
                         "    <tokenlist operation='append'>" +
@@ -107,7 +105,7 @@ public class UserConfigBuilderTest {
     }
 
     @Test
-    public void no_exception_when_config_class_does_not_exist() throws ParserConfigurationException, IOException, SAXException {
+    public void no_exception_when_config_class_does_not_exist() throws ParserConfigurationException {
         Element configRoot = getDocument("<config name=\"unknown\">" +
                 "    <foo>1</foo>" +
                 "</config>");
@@ -116,7 +114,7 @@ public class UserConfigBuilderTest {
         assertNotNull(builder);
     }
 
-    private Element getDocument(String xml) throws ParserConfigurationException {
+    private Element getDocument(String xml) {
         Reader xmlReader = new StringReader("<model>" + xml + "</model>");
         Document doc;
         try {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/Bug6068056Test.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/Bug6068056Test.java
index b90c3173bec..6bc161a0212 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/Bug6068056Test.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/Bug6068056Test.java
@@ -44,7 +44,7 @@ public class Bug6068056Test {
             "</services>";
 
     @Test(expected = RuntimeException.class)
-    public void testContainerClusterCalledDocproc() throws Exception {
+    public void testContainerClusterCalledDocproc() {
         VespaModelCreatorWithMockPkg creator = new VespaModelCreatorWithMockPkg(HOSTS, SERVICES);
         creator.create();
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
index c0dd894695e..567e54ed4c4 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.model.builder.xml.dom;
 import com.yahoo.collections.CollectionUtil;
 import com.yahoo.config.ConfigInstance;
 import com.yahoo.config.application.api.ApplicationPackage;
-import com.yahoo.config.model.api.container.ContainerServiceType;
 import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.deploy.TestProperties;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java
index 765d825bc2b..b5b29c083a8 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilderTest.java
@@ -18,7 +18,6 @@ import org.xml.sax.InputSource;
 
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.*;
-import java.util.ArrayList;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -155,7 +154,7 @@ public class DomConfigPayloadBuilderTest {
 
     // Verifies that an exception is thrown when the root element is not 'config'.
     @Test
-    public void testFailWrongTagName()  throws FileNotFoundException, ParserConfigurationException {
+    public void testFailWrongTagName() throws ParserConfigurationException {
         Element configRoot = getDocument(new StringReader("<configs name=\"foo\"/>"));
         try {
             new DomConfigPayloadBuilder(null).build(configRoot);
@@ -168,7 +167,7 @@ public class DomConfigPayloadBuilderTest {
 
     // Verifies that an exception is thrown when the root element is not 'config'.
     @Test
-    public void testFailNoNameAttribute()  throws FileNotFoundException, ParserConfigurationException {
+    public void testFailNoNameAttribute() throws ParserConfigurationException {
         Element configRoot = getDocument(new StringReader("<config/>"));
         try {
             new DomConfigPayloadBuilder(null).build(configRoot);
@@ -180,7 +179,7 @@ public class DomConfigPayloadBuilderTest {
     }
 
     @Test
-    public void testNamespace() throws FileNotFoundException, ParserConfigurationException {
+    public void testNamespace() throws ParserConfigurationException {
         Element configRoot = getDocument(new StringReader("<config name=\"function-test\" namespace=\"config\">" +
                 "<int_val>1</int_val> +" +
                 "</config>"));
@@ -201,7 +200,7 @@ public class DomConfigPayloadBuilderTest {
     }
 
     @Test
-    public void testNameParsing() throws FileNotFoundException, ParserConfigurationException {
+    public void testNameParsing() throws ParserConfigurationException {
         Element configRoot = getDocument(new StringReader("<config name=\"function-test\" version=\"1\" namespace=\"config\">" +
                 "<int_val>1</int_val> +" +
                 "</config>"));
@@ -226,7 +225,7 @@ public class DomConfigPayloadBuilderTest {
     }
 
     @Test(expected = ConfigurationRuntimeException.class)
-    public void testNameParsingInvalidName() throws FileNotFoundException, ParserConfigurationException {
+    public void testNameParsingInvalidName() throws ParserConfigurationException {
         Element configRoot = getDocument(new StringReader("<config name=\" function-test\" version=\"1\">" +
                 "<int_val>1</int_val> +" +
                 "</config>"));
@@ -234,7 +233,7 @@ public class DomConfigPayloadBuilderTest {
     }
 
     @Test(expected = ConfigurationRuntimeException.class)
-    public void testNameParsingInvalidNamespace() throws FileNotFoundException, ParserConfigurationException {
+    public void testNameParsingInvalidNamespace() throws ParserConfigurationException {
         Element configRoot = getDocument(new StringReader("<config name=\"function-test\" namespace=\"_foo\" version=\"1\">" +
                 "<int_val>1</int_val> +" +
                 "</config>"));
@@ -309,7 +308,7 @@ public class DomConfigPayloadBuilderTest {
         //assertThat(builder.warnings().size(), is(1));
     }
 
-    private Element getDocument(Reader xmlReader) throws ParserConfigurationException {
+    private Element getDocument(Reader xmlReader) {
         Document doc;
         try {
             doc = XmlHelper.getDocumentBuilder().parse(new InputSource(xmlReader));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
index dff21904c75..09b7acafefd 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilderTest.java
@@ -82,7 +82,7 @@ public class VespaDomBuilderTest {
 
 
     @Test
-    public void testUserConfigsWithNamespace() throws Exception {
+    public void testUserConfigsWithNamespace() {
         VespaModel model = createModel(hosts, servicesWithNamespace);
 
         GenericConfig.GenericConfigBuilder builder = 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerIncludeTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerIncludeTest.java
index f40981916fa..62a36422dd8 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerIncludeTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerIncludeTest.java
@@ -117,7 +117,7 @@ public class ContainerIncludeTest {
     }
 
     @Test
-    public void included_file_with_xml_schema_violation() throws Exception {
+    public void included_file_with_xml_schema_violation() {
         try {
             VespaModelCreatorWithFilePkg creator = new VespaModelCreatorWithFilePkg("src/test/cfg/container/data/include_xml_error/");
             creator.create(true);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
index 9056a30eda2..6ec41df6a1f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
@@ -11,9 +11,6 @@ import com.yahoo.vespa.model.container.xml.ContainerModelBuilder;
 import com.yahoo.vespa.model.container.xml.ContainerModelBuilder.Networking;
 import org.junit.Test;
 import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
 
 import static com.yahoo.collections.CollectionUtil.first;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -35,7 +32,7 @@ public class FilterBindingsTest extends DomBuilderTest {
     }
 
 
-    private void buildContainerCluster(Element containerElem) throws SAXException, IOException {
+    private void buildContainerCluster(Element containerElem) {
         ContainerModel model = new ContainerModelBuilder(true, Networking.enable).build(DeployState.createTestState(), null, null, root, containerElem);
         root.freezeModelTopology();
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/jersey/xml/RestApiTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/jersey/xml/RestApiTest.java
index e954e6343de..9ca508019b2 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/jersey/xml/RestApiTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/jersey/xml/RestApiTest.java
@@ -104,7 +104,7 @@ public class RestApiTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void all_non_restApi_components_are_injected_to_RestApiContext() throws Exception {
+    public void all_non_restApi_components_are_injected_to_RestApiContext() {
         ComponentsConfig componentsConfig = root.getConfig(ComponentsConfig.class, CLUSTER_ID);
 
         Set<ComponentId> clusterChildrenComponentIds = getContainerCluster(CLUSTER_ID).getAllComponents().stream()
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java
index 607bc484525..98bc4210602 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/MockSearchClusters.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.model.container.search.searchchain;
 
 import com.yahoo.vespa.config.search.AttributesConfig;
 import com.yahoo.vespa.config.search.RankProfilesConfig;
-import com.yahoo.config.model.ConfigModelRepo;
 import com.yahoo.config.model.producer.AbstractConfigProducerRoot;
 import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
 import com.yahoo.search.config.IndexInfoConfig;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest.java
index d81ffedef7f..365a3ea44b5 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest.java
@@ -11,9 +11,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Element;
 
-import java.util.List;
-
-import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java
index 9dd6f834e62..ef80683abd6 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTest2.java
@@ -20,7 +20,7 @@ public class SearchChainsTest2 {
     private MockRoot root;
 
     @Before
-    public void prepareTest() throws Exception {
+    public void prepareTest() {
         root = new MockRoot("root");
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTestBase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTestBase.java
index 51a8333ef6e..8b49d1bff0d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTestBase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SearchChainsTestBase.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.container.search.searchchain;
 
-import com.yahoo.binaryprefix.BinaryScaledAmount;
 import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
 import com.yahoo.vespa.model.builder.xml.dom.chains.search.DomSearchChainsBuilder;
 import org.junit.Before;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SourceGroupTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SourceGroupTest.java
index d14905ddab0..cc6478fa4a4 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SourceGroupTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/searchchain/SourceGroupTest.java
@@ -24,7 +24,7 @@ public class SourceGroupTest {
     private SearchChains searchChains;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         root = new MockRoot();
         searchChains = new SearchChains(root, "searchchains");
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java
index 746e771667f..44181234d9a 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/QueryProfilesTestCase.java
@@ -1,26 +1,20 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.container.search.test;
 
-import com.yahoo.component.ComponentId;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.search.query.profile.QueryProfile;
 import com.yahoo.search.query.profile.QueryProfileRegistry;
-import com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry;
 import com.yahoo.search.query.profile.config.QueryProfileConfigurer;
-import com.yahoo.search.query.profile.config.QueryProfileXMLReader;
 import com.yahoo.search.query.profile.types.FieldDescription;
 import com.yahoo.search.query.profile.types.FieldType;
 import com.yahoo.search.query.profile.types.QueryProfileType;
 import com.yahoo.search.query.profile.types.QueryProfileTypeRegistry;
-import com.yahoo.searchdefinition.SearchBuilder;
-import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.model.container.search.QueryProfiles;
 import com.yahoo.vespa.model.test.utils.DeployLoggerStub;
 import org.junit.Test;
 
 import java.io.IOException;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import static helpers.CompareConfigTestHelper.assertSerializedConfigFileEquals;
 import static org.junit.Assert.assertEquals;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
index 3fea346f788..37a57fc59c9 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java
@@ -13,9 +13,7 @@ import com.yahoo.vespa.model.container.http.xml.HttpBuilder;
 import com.yahoo.vespa.model.container.jersey.Jersey2Servlet;
 import org.junit.Test;
 import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
@@ -46,7 +44,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
             ContainerCluster.ROOT_HANDLER_BINDING);
 
     @Test
-    public void access_control_filter_chain_is_set_up() throws Exception {
+    public void access_control_filter_chain_is_set_up() {
         Element clusterElem = DomBuilderTest.parse(
                 "  <http>",
                 "    <filtering>",
@@ -61,7 +59,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void properties_are_set_from_xml() throws Exception {
+    public void properties_are_set_from_xml() {
         Element clusterElem = DomBuilderTest.parse(
                 "  <http>",
                 "    <filtering>",
@@ -82,7 +80,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void read_is_disabled_and_write_is_enabled_by_default() throws Exception {
+    public void read_is_disabled_and_write_is_enabled_by_default() {
         Element clusterElem = DomBuilderTest.parse(
                 "  <http>",
                 "    <filtering>",
@@ -98,7 +96,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void read_and_write_can_be_overridden() throws Exception {
+    public void read_and_write_can_be_overridden() {
         Element clusterElem = DomBuilderTest.parse(
                 "  <http>",
                 "    <filtering>",
@@ -114,7 +112,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void access_control_filter_chain_has_correct_handler_bindings() throws Exception {
+    public void access_control_filter_chain_has_correct_handler_bindings() {
         Element clusterElem = DomBuilderTest.parse(
                 "<container version='1.0'>",
                 "  <search/>",
@@ -145,7 +143,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void handler_can_be_excluded_by_excluding_one_of_its_bindings() throws Exception {
+    public void handler_can_be_excluded_by_excluding_one_of_its_bindings() {
         final String notExcludedBinding = "http://*/custom-handler/*";
         final String excludedBinding = "http://*/excluded/*";
         Element clusterElem = DomBuilderTest.parse(
@@ -166,7 +164,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void access_control_filter_chain_has_all_servlet_bindings() throws Exception {
+    public void access_control_filter_chain_has_all_servlet_bindings() {
         final String servletPath = "servlet/path";
         final String restApiPath = "api/v0";
         final Set<String> requiredBindings = ImmutableSet.of(servletPath, restApiPath);
@@ -194,7 +192,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void servlet_can_be_excluded_by_excluding_one_of_its_bindings() throws Exception {
+    public void servlet_can_be_excluded_by_excluding_one_of_its_bindings() {
         final String servletPath = "servlet/path";
         final String notExcludedBinding = "http://*:8081/" + servletPath;
         final String excludedBinding = "http://*:8080/" + servletPath;
@@ -215,7 +213,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void rest_api_can_be_excluded_by_excluding_one_of_its_bindings() throws Exception {
+    public void rest_api_can_be_excluded_by_excluding_one_of_its_bindings() {
         final String restApiPath = "api/v0";
         final String notExcludedBinding = "http://*:8081/" + restApiPath + Jersey2Servlet.BINDING_SUFFIX;;
         final String excludedBinding = "http://*:8080/" + restApiPath + Jersey2Servlet.BINDING_SUFFIX;;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
index 3876ce25d96..4ea10c9a1c1 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessLogTest.java
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertEquals;
 public class AccessLogTest extends ContainerModelBuilderTestBase {
 
     @Test
-    public void default_access_log_is_only_added_when_search_is_present() throws Exception {
+    public void default_access_log_is_only_added_when_search_is_present() {
         Element cluster1Elem = DomBuilderTest.parse(
                 "<container id='cluster1' version='1.0'>",
                 "<search />",
@@ -45,7 +45,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void default_search_access_log_can_be_disabled() throws Exception {
+    public void default_search_access_log_can_be_disabled() {
         final String jdiscClusterId = "jdisc-cluster";
 
         Element clusterElem = DomBuilderTest.parse(
@@ -69,7 +69,7 @@ public class AccessLogTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void access_log_can_be_configured() throws Exception {
+    public void access_log_can_be_configured() {
         Element clusterElem = DomBuilderTest.parse(
                 "<container id='default' version='1.0'>",
                 "  <accesslog type='vespa' ",
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 7b382a45730..8b92e1091ca 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -396,7 +396,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void nested_components_are_injected_to_handlers() throws Exception {
+    public void nested_components_are_injected_to_handlers() {
         Element clusterElem = DomBuilderTest.parse(
                 "<container id='default' version='1.0'>",
                 "  <handler id='myHandler'>",
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
index 4fec94d4ab4..41997925666 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
@@ -71,7 +71,7 @@ public abstract class ContainerModelBuilderTestBase {
     }
 
     @Before
-    public void prepareTest() throws Exception {
+    public void prepareTest() {
         root = new MockRoot("root");
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java
index 0695f7b30d7..9794062d83f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/IdentityBuilderTest.java
@@ -10,9 +10,6 @@ import com.yahoo.container.core.identity.IdentityConfig;
 import com.yahoo.vespa.model.container.IdentityProvider;
 import org.junit.Test;
 import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
 
 import static org.junit.Assert.assertEquals;
 
@@ -21,7 +18,7 @@ import static org.junit.Assert.assertEquals;
  */
 public class IdentityBuilderTest extends ContainerModelBuilderTestBase {
     @Test
-    public void identity_config_produced_from_deployment_spec() throws IOException, SAXException {
+    public void identity_config_produced_from_deployment_spec() {
         Element clusterElem = DomBuilderTest.parse(
                 "<container id='default' version='1.0'><search /></container>");
         String deploymentXml = "<deployment version='1.0' athenz-domain='domain' athenz-service='service'>\n" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
index 4e119506104..f0fcb239521 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertTrue;
 public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBase {
 
     @Test
-    public void verify_that_overriding_connector_options_works() throws Exception {
+    public void verify_that_overriding_connector_options_works() {
         Element clusterElem = DomBuilderTest.parse(
                 "<container id='default' version='1.0'>\n" +
                 "  <http>\n" +
@@ -56,7 +56,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     }
 
     @Test
-    public void verify_that_enabling_jetty_works() throws Exception {
+    public void verify_that_enabling_jetty_works() {
         Element clusterElem = DomBuilderTest.parse(
                 "<container id='default' version='1.0'>" +
                         nodesXml +
@@ -67,7 +67,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     }
 
     @Test
-    public void verify_that_enabling_jetty_works_for_custom_http_servers() throws Exception {
+    public void verify_that_enabling_jetty_works_for_custom_http_servers() {
         Element clusterElem = DomBuilderTest.parse(
                 "<container id='default' version='1.0'>",
                 "  <http>",
@@ -80,7 +80,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     }
 
     @Test
-    public void verifyThatJettyHttpServerHasFilterBindingsProvider() throws Exception {
+    public void verifyThatJettyHttpServerHasFilterBindingsProvider() {
         final Element clusterElem = DomBuilderTest.parse(
                 "<container id='default' version='1.0'>",
                 nodesXml,
@@ -101,7 +101,7 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas
     }
 
     @Test
-    public void verifyThatJettyHttpServerHasFilterBindingsProviderForCustomHttpServers() throws Exception {
+    public void verifyThatJettyHttpServerHasFilterBindingsProviderForCustomHttpServers() {
         final Element clusterElem = DomBuilderTest.parse(
                 "<container id='default' version='1.0'>",
                 "  <http>",
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java
index 7789b4b8a16..6ebd530ca8c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java
@@ -64,7 +64,7 @@ public class RoutingBuilderTest extends ContainerModelBuilderTestBase {
     }
 
 
-    private ApplicationContainer getContainer(ApplicationPackage applicationPackage, String region, Element clusterElem) throws IOException, SAXException {
+    private ApplicationContainer getContainer(ApplicationPackage applicationPackage, String region, Element clusterElem) {
         DeployState deployState = new DeployState.Builder()
                 .applicationPackage(applicationPackage)
                 .zone(new Zone(Environment.prod, RegionName.from(region)))
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
index 0da3b8e1f5f..1f0b0188681 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
@@ -93,14 +93,14 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
 
     // TODO: remove test when all containers are named 'container'
     @Test
-    public void cluster_with_only_search_gets_qrserver_as_service_name() throws Exception {
+    public void cluster_with_only_search_gets_qrserver_as_service_name() {
         createClusterWithOnlyDefaultChains();
         ApplicationContainerCluster cluster = (ApplicationContainerCluster)root.getChildren().get("default");
         assertThat(cluster.getContainers().get(0).getServiceName(), is(QRSERVER.serviceName));
     }
 
     @Test
-    public void empty_search_element_gives_default_chains() throws Exception {
+    public void empty_search_element_gives_default_chains() {
         createClusterWithOnlyDefaultChains();
         assertThat(chainsConfig().chains(), hasItemWithMethod("vespaPhases", "id"));
         assertThat(chainsConfig().chains(), hasItemWithMethod("native", "id"));
@@ -137,7 +137,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void cluster_is_connected_to_content_clusters() throws Exception {
+    public void cluster_is_connected_to_content_clusters() {
         String hosts = hostsXml();
 
         String services = "" +
@@ -163,7 +163,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void cluster_is_connected_to_search_clusters() throws Exception {
+    public void cluster_is_connected_to_search_clusters() {
         String hosts = hostsXml();
 
         String services = "" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
index c70e05c39c3..d98d1da9d2a 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
@@ -695,7 +695,7 @@ public class ContentClusterTest extends ContentBaseTest {
     }
 
     @Test
-    public void testConfiguredMetrics() throws Exception {
+    public void testConfiguredMetrics() {
         String xml = "" +
             "<services>" +
             "<content version=\"1.0\" id=\"storage\">\n" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/GenericConfigTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/GenericConfigTest.java
index a65c4e50521..992edf6b1bb 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/GenericConfigTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/GenericConfigTest.java
@@ -2,7 +2,6 @@
 package com.yahoo.vespa.model.content;
 
 import com.yahoo.vespa.config.content.StorFilestorConfig;
-import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 import com.yahoo.vespa.model.content.storagecluster.StorageCluster;
@@ -10,9 +9,6 @@ import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 import org.junit.Before;
 import org.junit.Test;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -53,12 +49,12 @@ public class GenericConfigTest {
     }
 
     @Before
-    public void getVespaModel() throws IOException, SAXException, ParseException {
+    public void getVespaModel() {
         model = (new VespaModelCreatorWithMockPkg(ContentBaseTest.getHosts(), servicesXml(), ApplicationPackageUtils.generateSearchDefinitions("type1"))).create();
     }
 
     @Test
-    public void config_override_on_root_is_visible_on_storage_cluster() throws Exception {
+    public void config_override_on_root_is_visible_on_storage_cluster() {
         StorageCluster cluster = model.getContentClusters().get("storage").getStorageNodes();
 
         StorFilestorConfig config = model.getConfig(StorFilestorConfig.class, cluster.getConfigId());
@@ -66,7 +62,7 @@ public class GenericConfigTest {
     }
 
     @Test
-    public void config_override_on_root_is_visible_on_content_cluster() throws Exception {
+    public void config_override_on_root_is_visible_on_content_cluster() {
         ContentCluster cluster = model.getContentClusters().get("storage");
 
         StorFilestorConfig config = model.getConfig(StorFilestorConfig.class, cluster.getConfigId());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java
index f402bae8fd9..afedbaea779 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedHierarchicDistributionTest.java
@@ -171,7 +171,7 @@ public class IndexedHierarchicDistributionTest {
         return createCluster(createClusterXml(groupXml, 2, 2));
     }
 
-    private String getOddGroupsClusterXml() throws Exception {
+    private String getOddGroupsClusterXml() {
         return joinLines("  <group>",
                 "    <distribution partitions='2|*'/>",
                 "    <group distribution-key='0' name='group0'>",
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java
index e25bcea29f6..55d070d7247 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexingAndDocprocRoutingTest.java
@@ -149,7 +149,7 @@ public class IndexingAndDocprocRoutingTest extends ContentBaseTest {
     }
 
     @Test
-    public void noContentClustersOneDocprocCluster() throws ParseException, IOException, SAXException {
+    public void noContentClustersOneDocprocCluster() {
         String services =
                 "<?xml version='1.0' encoding='utf-8' ?>\n" +
                         "<services version='1.0'>\n" +
@@ -447,14 +447,12 @@ public class IndexingAndDocprocRoutingTest extends ContentBaseTest {
                 searchClusterPost, searchClusterPostPost, mainPost, searchClusterSpecs);
     }
 
-    private VespaModel getIndexedSearchVespaModel(String xml)
-            throws ParseException, IOException, SAXException {
+    private VespaModel getIndexedSearchVespaModel(String xml) {
         List<String> sds = ApplicationPackageUtils.generateSearchDefinitions("music", "album", "artist");
         return new VespaModelCreatorWithMockPkg(getHosts(), xml, sds).create();
     }
 
-    private VespaModel getIndexedContentVespaModel(List<DocprocClusterSpec> docprocClusterSpecs, List<SearchClusterSpec> searchClusterSpecs)
-            throws ParseException, IOException, SAXException {
+    private VespaModel getIndexedContentVespaModel(List<DocprocClusterSpec> docprocClusterSpecs, List<SearchClusterSpec> searchClusterSpecs) {
         List<String> sds = new ArrayList<>();
 
         for (SearchClusterSpec cluster : searchClusterSpecs) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/MonitoringConfigSnoopTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/MonitoringConfigSnoopTest.java
index dea86616f06..d73140d39d5 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/MonitoringConfigSnoopTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/MonitoringConfigSnoopTest.java
@@ -17,7 +17,7 @@ public class MonitoringConfigSnoopTest {
 
     private TestRoot root;
 
-    public void initRoot(int interval) throws Exception {
+    public void initRoot(int interval) {
         TestDriver tester = new TestDriver();
         root = tester.buildModel(getAdminXml(interval) + getContent());
     }
@@ -53,7 +53,7 @@ public class MonitoringConfigSnoopTest {
     }
 
     @Test
-    public void correct_config_is_snooped_default_interval() throws Exception {
+    public void correct_config_is_snooped_default_interval() {
         String getAdminXmlIntervalNotSpecified = "<admin version='2.0'>"
                 + "  <adminserver hostalias='mockhost' />"
                 + "</admin>";
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
index 27f5af52b6c..bbb101dbb08 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
@@ -33,7 +33,7 @@ public class StorageClusterTest {
         MockRoot root = new MockRoot();
         return parse(xml, root);
     }
-    StorageCluster parse(String xml, MockRoot root) throws Exception {
+    StorageCluster parse(String xml, MockRoot root) {
         root.getDeployState().getDocumentModel().getDocumentManager().add(
                 new NewDocumentType(new NewDocumentType.Name("music"))
         );
@@ -190,7 +190,7 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void testCapacity() throws Exception {
+    public void testCapacity() {
         String xml =
                 "<cluster id=\"storage\">\n" +
                         "  <documents/>" +
@@ -214,7 +214,7 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void testRootFolder() throws Exception {
+    public void testRootFolder() {
         String xml =
                 "<cluster id=\"storage\">\n" +
                         "  <documents/>" +
@@ -245,7 +245,7 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void testGenericPersistenceTuning() throws Exception {
+    public void testGenericPersistenceTuning() {
         String xml =
                 "<cluster id=\"storage\">\n" +
                         "<documents/>" +
@@ -271,7 +271,7 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void requireThatUserDoesNotSpecifyBothGroupAndNodes() throws Exception {
+    public void requireThatUserDoesNotSpecifyBothGroupAndNodes() {
         String xml =
                 "<cluster id=\"storage\">\n" +
                         "<documents/>\n" +
@@ -302,7 +302,7 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void requireThatGroupNamesMustBeUniqueAmongstSiblings() throws Exception {
+    public void requireThatGroupNamesMustBeUniqueAmongstSiblings() {
         String xml =
                 "<cluster id=\"storage\">\n" +
                 "<documents/>\n" +
@@ -327,7 +327,7 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void requireThatGroupNamesCanBeDuplicatedAcrossLevels() throws Exception {
+    public void requireThatGroupNamesCanBeDuplicatedAcrossLevels() {
         String xml =
                 "<cluster id=\"storage\">\n" +
                 "<documents/>\n" +
@@ -351,7 +351,7 @@ public class StorageClusterTest {
     }
 
     @Test
-    public void requireThatNestedGroupsRequireDistribution() throws Exception {
+    public void requireThatNestedGroupsRequireDistribution() {
         String xml =
                 "<cluster id=\"storage\">\n" +
                         "<documents/>\n" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageContentTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageContentTest.java
index 38f4b392f41..d9d29f874de 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageContentTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageContentTest.java
@@ -4,16 +4,13 @@ package com.yahoo.vespa.model.content;
 import com.yahoo.documentapi.messagebus.protocol.DocumentrouteselectorpolicyConfig;
 import com.yahoo.messagebus.routing.RouteSpec;
 import com.yahoo.messagebus.routing.RoutingTableSpec;
-import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.routing.DocumentProtocol;
 import com.yahoo.vespa.model.routing.Routing;
 import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 import org.junit.Test;
-import org.xml.sax.SAXException;
 
-import java.io.IOException;
 import java.util.*;
 
 import static org.junit.Assert.*;
@@ -44,7 +41,7 @@ public class StorageContentTest extends ContentBaseTest {
                 "</services>";
     }
 
-    private VespaModel getStorageVespaModel(String cluster1docs, String cluster2docs) throws ParseException, IOException, SAXException {
+    private VespaModel getStorageVespaModel(String cluster1docs, String cluster2docs) {
         List<String> sds = ApplicationPackageUtils.generateSearchDefinitions("type1", "type2", "type3");
         return new VespaModelCreatorWithMockPkg(getHosts(), createStorageVespaServices(cluster1docs, cluster2docs), sds).create();
     }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java
index 31c1e250183..c1789a05f3c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java
@@ -15,7 +15,7 @@ import static org.junit.Assert.assertTrue;
  */
 public class StorageGroupTest {
 
-    ContentCluster parse(String xml) throws Exception {
+    ContentCluster parse(String xml) {
         return ContentClusterUtils.createCluster(xml, new MockRoot());
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
index fb54f8f9241..e4decbc9a10 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
@@ -4,14 +4,11 @@ package com.yahoo.vespa.model.content.cluster;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.config.model.test.TestDriver;
-import com.yahoo.searchdefinition.SearchBuilder;
-import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.config.search.core.PartitionsConfig;
 import com.yahoo.vespa.config.search.core.ProtonConfig;
 import com.yahoo.vespa.model.content.Content;
-import com.yahoo.vespa.model.search.IndexedSearchCluster;
-import com.yahoo.vespa.model.search.SearchDefinition;
 import com.yahoo.vespa.model.search.Dispatch;
+import com.yahoo.vespa.model.search.IndexedSearchCluster;
 import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import org.junit.Test;
 
@@ -42,7 +39,7 @@ public class ClusterTest {
     }
 
     @Test
-    public void requireThatSearchCoverageIsApplied() throws ParseException {
+    public void requireThatSearchCoverageIsApplied() {
         ContentCluster cluster = newContentCluster(joinLines("<search>",
                 "  <coverage>",
                 "    <minimum>0.11</minimum>",
@@ -142,13 +139,6 @@ public class ClusterTest {
         return "<document mode='index' type='my_document' " + (globalDocType ? "global='true' " : "") + "/>";
     }
 
-    private static SearchDefinition newSearchDefinition(String name) throws ParseException {
-        SearchBuilder builder = new SearchBuilder();
-        builder.importString("search " + name + " { document " + name + " { } }");
-        builder.build();
-        return new SearchDefinition(name, builder.getSearch(name));
-    }
-
     private static ProtonConfig getProtonConfig(ContentCluster cluster) {
         ProtonConfig.Builder builder = new ProtonConfig.Builder();
         cluster.getSearch().getConfig(builder);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java
index 95c57bb544c..866c03d82f0 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterBuilder.java
@@ -77,7 +77,7 @@ public class ContentClusterBuilder {
         return this;
     }
 
-    public ContentCluster build(MockRoot root) throws Exception {
+    public ContentCluster build(MockRoot root) {
         return ContentClusterUtils.createCluster(getXml(), root);
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/generic/GenericServicesTest.java b/config-model/src/test/java/com/yahoo/vespa/model/generic/GenericServicesTest.java
index c6c08df64f4..0e7fce2d1ef 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/generic/GenericServicesTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/generic/GenericServicesTest.java
@@ -2,17 +2,9 @@
 package com.yahoo.vespa.model.generic;
 
 import com.yahoo.cloud.config.SentinelConfig;
-import com.yahoo.config.codegen.CNode;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.model.application.provider.FilesApplicationPackage;
-import com.yahoo.vespa.config.ConfigDefinitionKey;
-import com.yahoo.vespa.config.ConfigPayload;
-import com.yahoo.vespa.config.ConfigPayloadBuilder;
-import com.yahoo.vespa.config.GenericConfig;
-import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.model.VespaModel;
-import com.yahoo.vespa.model.generic.service.Service;
-import com.yahoo.vespa.model.generic.service.ServiceCluster;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.xml.sax.SAXException;
@@ -40,7 +32,7 @@ public class GenericServicesTest {
     }
 
     @Test
-    public void testServicesSentinelConfig() throws IOException, SAXException {
+    public void testServicesSentinelConfig() {
         String sentinelConfigId1="hosts/bogusname1/sentinel";
         String sentinelConfigId2="hosts/bogusname2/sentinel";
         String sentinelConfigId3="hosts/bogusname3/sentinel";
@@ -72,7 +64,7 @@ public class GenericServicesTest {
     }
 
     @Test
-    public void testServicesModel() throws IOException, SAXException {
+    public void testServicesModel() {
         // Testing that this model can be constructed only for now
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/ml/ImportedModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/ml/ImportedModelTester.java
index 41811738ea4..ce36ecc4a1c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/ml/ImportedModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/ml/ImportedModelTester.java
@@ -9,12 +9,10 @@ import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.io.GrowableByteBuffer;
 import com.yahoo.io.IOUtils;
 import com.yahoo.path.Path;
-import com.yahoo.searchdefinition.RankProfile;
 import com.yahoo.searchdefinition.RankingConstant;
 import ai.vespa.rankingexpression.importer.onnx.OnnxImporter;
 import ai.vespa.rankingexpression.importer.tensorflow.TensorFlowImporter;
 import ai.vespa.rankingexpression.importer.xgboost.XGBoostImporter;
-import com.yahoo.searchdefinition.derived.RawRankProfile;
 import com.yahoo.tensor.Tensor;
 import com.yahoo.tensor.serialization.TypedBinaryFormat;
 import com.yahoo.vespa.model.VespaModel;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java
index f50d41b9c95..3c5008cd5f6 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/MultilevelDispatchTest.java
@@ -169,7 +169,6 @@ public class MultilevelDispatchTest {
     @Test
     public void requireThatMaxHitsIsScaled() throws Exception {
         ContentCluster cr = createCluster(getSimpleDispatchXml() + getMaxhitsTuning());
-        IndexedSearchCluster ix = cr.getSearch().getIndexed();
         Dispatch tld = cr.getSearch().getIndexed().getTLDs().get(0);
         PartitionsConfig.Builder builder = new PartitionsConfig.Builder();
         tld.getConfig(builder);
@@ -213,7 +212,7 @@ public class MultilevelDispatchTest {
     }
 
     @Test
-    public void requireThatSearchCoverageIsSetInSingleLevelSetup() throws Exception {
+    public void requireThatSearchCoverageIsSetInSingleLevelSetup() {
         TestRoot root = new TestDriver(true).buildModel(new MockApplicationPackage.Builder()
                                                                 .withServices("<services version='1.0'>" +
                                                                                       "<content id='stateful' version='1.0'>" +
@@ -370,7 +369,7 @@ public class MultilevelDispatchTest {
     }
 
     @Test
-    public void requireThatWeReferenceValidNodesWhenSettingUpDispatchGroups() throws Exception {
+    public void requireThatWeReferenceValidNodesWhenSettingUpDispatchGroups() {
         try {
             createIllegalSetupWithIllegalNodeReference();
             assertFalse("Did not get expected Exception", true);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java
index 7aadca4a1af..90d41de8939 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java
@@ -11,7 +11,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static com.yahoo.vespa.model.search.NodeFlavorTuning.MB;
 import static com.yahoo.vespa.model.search.NodeFlavorTuning.GB;
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
index 2415aadc8a3..b2c7da4b851 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java
@@ -7,7 +7,6 @@ import com.yahoo.vespa.config.search.core.ProtonConfig;
 import com.yahoo.vespa.config.search.RankProfilesConfig;
 import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
 import com.yahoo.search.config.IndexInfoConfig;
-import com.yahoo.searchdefinition.parser.ParseException;
 import com.yahoo.vespa.config.search.AttributesConfig;
 import com.yahoo.vespa.configdefinition.IlscriptsConfig;
 import com.yahoo.vespa.model.VespaModel;
@@ -17,8 +16,7 @@ import com.yahoo.vespa.model.search.IndexedSearchCluster;
 import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 import org.junit.Test;
-import org.xml.sax.SAXException;
-import java.io.IOException;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Arrays;
@@ -103,7 +101,7 @@ public class DocumentDatabaseTestCase {
         assertEquals(type1Id, proton.documentdb(0).configid());
     }
     @Test
-    public void requireThatWeCanHaveOneSDForIndexedMode() throws IOException, SAXException, ParseException {
+    public void requireThatWeCanHaveOneSDForIndexedMode() {
         assertSingleSD("index");
     }
 
@@ -213,7 +211,7 @@ public class DocumentDatabaseTestCase {
     }
 
     @Test
-    public void requireThatWeCanHaveMultipleSearchDefinitions() throws IOException, SAXException, ParseException {
+    public void requireThatWeCanHaveMultipleSearchDefinitions() {
         final List<String> sds = Arrays.asList("type1", "type2", "type3");
         VespaModel model = new VespaModelCreatorWithMockPkg(vespaHosts, createVespaServices(sds, "index"),
                 ApplicationPackageUtils.generateSearchDefinitions(sds)).create();
@@ -263,7 +261,7 @@ public class DocumentDatabaseTestCase {
     }
 
     @Test
-    public void requireThatRelevantConfigIsAvailableForClusterSearcher() throws ParseException, IOException, SAXException {
+    public void requireThatRelevantConfigIsAvailableForClusterSearcher() {
         final List<String> sds = Arrays.asList("type1", "type2");
         VespaModel model = new VespaModelCreatorWithMockPkg(vespaHosts, createVespaServices(sds, "index"),
                 ApplicationPackageUtils.generateSearchDefinitions(sds)).create();
@@ -336,7 +334,7 @@ public class DocumentDatabaseTestCase {
     }
 
     @Test
-    public void requireThatDocumentDBConfigIsAvailableForStreaming() throws ParseException, IOException, SAXException {
+    public void requireThatDocumentDBConfigIsAvailableForStreaming() {
         assertDocumentDBConfigAvailableForStreaming("streaming");
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
index e39e0147dbf..007dc5d7266 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
@@ -1,8 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.search.test;
 
-import com.yahoo.config.application.api.ApplicationPackage;
-import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.container.QrSearchersConfig;
 import com.yahoo.document.DataType;
 import com.yahoo.search.config.ClusterConfig;
@@ -19,9 +17,6 @@ import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 import org.junit.Test;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
@@ -49,7 +44,7 @@ public class SearchClusterTest {
             "</hosts>";
 
     @Test
-    public void testSdConfigLogical() throws IOException, SAXException {
+    public void testSdConfigLogical() {
         // sd1
         SDDocumentType sdt1=new SDDocumentType("s1");
         Search search1 = new Search("s1", null);
@@ -75,7 +70,7 @@ public class SearchClusterTest {
     }
 
     @Test
-    public void search_model_is_connected_to_container_clusters_two_content_clusters() throws Exception {
+    public void search_model_is_connected_to_container_clusters_two_content_clusters() {
         String services = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" +
                 "<services version=\"1.0\">" +
                 "  <admin version='2.0'>" +
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/storage/test/StorageModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/storage/test/StorageModelTestCase.java
index 19d46ea8f11..e4dd8aee607 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/storage/test/StorageModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/storage/test/StorageModelTestCase.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertThat;
 public class StorageModelTestCase {
 
     @Test(expected=RuntimeException.class)
-    public void testTwoClustersSameName() throws Exception {
+    public void testTwoClustersSameName() {
         createModel("src/test/cfg/storage/twoclusterssamename");
     }
 
@@ -31,7 +31,7 @@ public class StorageModelTestCase {
     }
 
     @Test
-    public void testIndexGreaterThanNumNodes() throws Exception {
+    public void testIndexGreaterThanNumNodes() {
         VespaModel vespaModel = createModel("src/test/cfg/storage/app_index_higher_than_num_nodes");
 
         // Test fleet controller config
@@ -43,7 +43,7 @@ public class StorageModelTestCase {
     }
 
     @Test
-    public void testMetricsSnapshotIntervalYAMAS() throws Exception {
+    public void testMetricsSnapshotIntervalYAMAS() {
         VespaModel vespaModel = createModel("src/test/cfg/storage/clustercontroller_advanced");
         ContentCluster contentCluster = vespaModel.getContentClusters().values().iterator().next();
         assertNotNull(contentCluster);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
index 1ce584c2910..a8e946bcea1 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/ModelAmendingTestCase.java
@@ -20,9 +20,7 @@ import com.yahoo.vespa.model.container.xml.ContainerModelBuilder;
 import com.yahoo.vespa.model.content.Content;
 import org.junit.Test;
 import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -42,7 +40,7 @@ import static org.junit.Assert.assertNotNull;
 public class ModelAmendingTestCase {
 
     @Test
-    public void testModelAmending() throws IOException, SAXException {
+    public void testModelAmending() {
         ConfigModelRegistry amendingModelRepo = MapConfigModelRegistry.createFromList(new AdminModelAmenderBuilder(),
                                                                                       new ContainerModelAmenderBuilder(),
                                                                                       new ContentModelAmenderBuilder());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/ParentService.java b/config-model/src/test/java/com/yahoo/vespa/model/test/ParentService.java
index c7559c68592..b7887262ed5 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/ParentService.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/ParentService.java
@@ -13,8 +13,6 @@ import org.w3c.dom.NodeList;
  */
 public class ParentService extends AbstractService implements com.yahoo.test.StandardConfig.Producer {
 
-    public int childCnt = 0;
-
     /**
      * Creates a new ParentService instance
      *
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/PortsMetaTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/PortsMetaTestCase.java
index 63c15bf2c13..7736bea3078 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/PortsMetaTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/PortsMetaTestCase.java
@@ -17,7 +17,7 @@ import static org.junit.Assert.assertTrue;
 public class PortsMetaTestCase {
 
     @Test
-    public void testRegister() throws Exception {
+    public void testRegister() {
         PortsMeta pm = new PortsMeta();
         pm.on(0).tag("foo");
         pm.on(1).tag("bar");
@@ -31,7 +31,7 @@ public class PortsMetaTestCase {
     }
 
     @Test
-    public void testAdminStatusApi() throws Exception {
+    public void testAdminStatusApi() {
         PortsMeta pm = new PortsMeta()
                 .on(0).tag("rpc").tag("nc").tag("admin").tag("status")
                 .on(1).tag("rpc").tag("rtx").tag("admin").tag("status")
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
index 3fa013d0089..333bb3728f6 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
@@ -28,7 +28,7 @@ import com.yahoo.vespa.model.ConfigProducer;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.admin.Admin;
 import com.yahoo.vespa.model.application.validation.Validation;
-import com.yahoo.vespa.model.test.utils.CommonVespaModelSetup;
+import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 import org.junit.Ignore;
@@ -89,7 +89,7 @@ public class VespaModelTestCase {
 
     // Verify that common config from plugins is delivered from the root node for any configId, using the Builder based API
     @Test
-    public void testCommonConfig() throws Exception {
+    public void testCommonConfig() {
         VespaModel model = getVespaModel(TESTDIR + "app_nohosts/");
         LogdConfig.Builder b = new LogdConfig.Builder();
         b = (LogdConfig.Builder) model.getConfig(b, "");
@@ -135,7 +135,7 @@ public class VespaModelTestCase {
     }
 
     @Test
-    public void testHostsOverrides() throws IOException, SAXException {
+    public void testHostsOverrides() {
         VespaModel model = new VespaModelCreatorWithMockPkg(
                 simpleHosts,
                 "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" +
@@ -171,8 +171,8 @@ public class VespaModelTestCase {
     }
 
     @Test
-    public void testCreateFromReaders() throws SAXException, IOException {
-        VespaModel model = CommonVespaModelSetup.createVespaModelWithMusic(
+    public void testCreateFromReaders() {
+        VespaModel model = new VespaModelCreatorWithMockPkg(
                 simpleHosts,
                 "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" +
                         "<services  version=\"1.0\">" +
@@ -195,7 +195,9 @@ public class VespaModelTestCase {
                         "     <document type=\"music\" mode=\"index\"/>" +
                         "   </documents>" +
                         "</content>" +
-                        "</services>");
+                        "</services>",
+                ApplicationPackageUtils.generateSearchDefinition("music"))
+                .create();
         MessagebusConfig.Builder mBusB = new MessagebusConfig.Builder();
         model.getConfig(mBusB, "client");
         MessagebusConfig mBus = new MessagebusConfig(mBusB);
@@ -253,11 +255,12 @@ public class VespaModelTestCase {
 
     @Test
     public void testNoAdmin() {
-        VespaModel model = CommonVespaModelSetup.createVespaModelWithMusic(
+        VespaModel model = new VespaModelCreatorWithMockPkg(
                 simpleHosts,
                 "<?xml version=\"1.0\" encoding=\"utf-8\" ?>" +
                         "<services version=\"1.0\">" +
-                        "</services>");
+                        "</services>")
+                .create();
         Admin admin = model.getAdmin();
         assertThat(admin.getSlobroks().size(), is(1));
         assertThat(admin.getConfigservers().size(), is(1));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java
index a58b6a2e372..ee6fc60ba46 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/ApplicationPackageUtils.java
@@ -1,11 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.test.utils;
 
-import com.yahoo.searchdefinition.Search;
-import com.yahoo.searchdefinition.SearchBuilder;
-import com.yahoo.searchdefinition.parser.ParseException;
-import com.yahoo.vespa.model.search.SearchDefinition;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -48,18 +43,6 @@ public class ApplicationPackageUtils {
                 "}";
     }
 
-    public static Search createSearch(String name, String field1, String field2) throws ParseException {
-        SearchBuilder sb = new SearchBuilder();
-        sb.importString(generateSearchDefinition(name, field1, field2));
-        sb.build();
-        return sb.getSearch();
-    }
-
-    public static SearchDefinition createSearchDefinition(String name, String field1, String field2) throws ParseException {
-        com.yahoo.searchdefinition.Search type = ApplicationPackageUtils.createSearch(name, field1, field2);
-        return new SearchDefinition(type.getName(), type);
-    }
-
     public static List<String> generateSearchDefinition(String name) {
         return generateSearchDefinitions(name);
     }
@@ -68,20 +51,6 @@ public class ApplicationPackageUtils {
         return generateSearchDefinitions(Arrays.asList(sdNames));
     }
 
-    public static List<SearchDefinition> createSearchDefinition(String name) throws ParseException {
-        return createSearchDefinitions(Arrays.asList(name));
-    }
-
-    public static List<SearchDefinition> createSearchDefinitions(List<String> sdNames) throws ParseException {
-        List<SearchDefinition> sds = new ArrayList<>();
-        int i = 0;
-        for (String sdName : sdNames) {
-            sds.add(createSearchDefinition(sdName, "f" + (i + 1), "f" + (i + 2)));
-            i = i + 2;
-        }
-        return sds;
-    }
-
     public static List<String> generateSearchDefinitions(List<String> sdNames) {
         List<String> sds = new ArrayList<>();
         int i = 0;
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/CommonVespaModelSetup.java b/config-model/src/test/java/com/yahoo/vespa/model/test/utils/CommonVespaModelSetup.java
deleted file mode 100644
index 3791331e40c..00000000000
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/utils/CommonVespaModelSetup.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.test.utils;
-
-import com.yahoo.config.application.api.ApplicationPackage;
-import com.yahoo.config.model.test.MockApplicationPackage;
-import com.yahoo.vespa.model.VespaModel;
-
-import java.io.File;
-
-/**
- * @author Tony Vaagenes
- */
-//TODO Remove, use VespaModelCreatorWithMockPkg or VespaModelCreatorWithFilePkg instead
-public class CommonVespaModelSetup {
-
-    public static VespaModel createVespaModelWithMusic(String path) {
-        return createVespaModelWithMusic(new File(path));
-    }
-
-    public static VespaModel createVespaModelWithMusic(File dir) {
-        VespaModelCreatorWithFilePkg modelCreator = new VespaModelCreatorWithFilePkg(dir);
-        return modelCreator.create();
-    }
-
-    public static VespaModel createVespaModelWithMusic(String hosts, String services) {
-        ApplicationPackage app = new MockApplicationPackage.Builder()
-                .withHosts(hosts)
-                .withServices(services)
-                .withSearchDefinition(MockApplicationPackage.MUSIC_SEARCHDEFINITION)
-                .build();
-        VespaModelCreatorWithMockPkg modelCreator = new VespaModelCreatorWithMockPkg(app);
-        return modelCreator.create();
-    }
-}
author	Harald Musum <musum@verizonmedia.com>	2019-07-25 07:01:31 +0200
committer	Harald Musum <musum@verizonmedia.com>	2019-07-25 07:01:31 +0200
commit	68527431b484fa1888d527ae2abab5f3f5b51fb5 (patch)
tree	ff5ef15e5e9cdfe0fdadedf83baf4480694d1a82
parent	29a0aa78101c9bb16dd2386438721e8128362f06 (diff)