Cleanup: No functional changes

2 files changed, 2 insertions, 9 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentModel.java b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentModel.java
index 112385e1801..388109a21af 100644
--- a/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/documentmodel/DocumentModel.java
@@ -11,21 +11,14 @@ import com.yahoo.documentmodel.DocumentTypeRepo;
  *
  * @author baldersheim
  */
+// TODO: This should be removed in favor of Application
 public class DocumentModel {
 
     private final DocumentTypeRepo documentMan = new DocumentTypeRepo();
     private final SearchManager searchMan = new SearchManager();
 
-    /**
-     *
-     * @return Returns the DocumentManager
-     */
     public DocumentTypeRepo getDocumentManager() { return documentMan; }
 
-    /**
-     *
-     * @return Returns the SearchManager
-     */
     public SearchManager getSearchManager() { return searchMan; }
 
 }
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 1488f5fd112..38b1d42862e 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
@@ -87,7 +87,7 @@ public class ConvertedModel {
         ApplicationPackage applicationPackage = context.rankProfile().applicationPackage();
         ImportedMlModel sourceModel = // TODO: Convert to name here, make sure its done just one way
                 context.importedModels().get(sourceModelFile(applicationPackage, modelPath));
-        ModelName modelName = new ModelName(context.rankProfile().getName(), modelPath, pathIsFile);
+        ModelName modelName = new ModelName(context.rankProfile().name(), modelPath, pathIsFile);
 
         if (sourceModel == null && ! new ModelStore(applicationPackage, modelName).exists())
             throw new IllegalArgumentException("No model '" + modelPath + "' is available. Available models: " +