1 files changed, 2 insertions, 9 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocumentDatabase.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocumentDatabase.java
index c45c2b1855b..d5a3e8c2786 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocumentDatabase.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocumentDatabase.java
@@ -1,13 +1,10 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.prelude.fastsearch;
 
-import com.google.common.collect.ImmutableMap;
 import com.yahoo.tensor.TensorType;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -27,7 +24,7 @@ public class DocumentDatabase {
     private final String name;
     private final DocsumDefinitionSet docsumDefSet;
 
-    private final ImmutableMap<String, RankProfile> rankProfiles;
+    private final Map<String, RankProfile> rankProfiles;
 
     public DocumentDatabase(DocumentdbInfoConfig.Documentdb documentDb) {
         this(documentDb.name(), new DocsumDefinitionSet(documentDb), toRankProfiles(documentDb.rankprofile()));
@@ -36,7 +33,7 @@ public class DocumentDatabase {
     public DocumentDatabase(String name, DocsumDefinitionSet docsumDefinitionSet, Collection<RankProfile> rankProfiles) {
         this.name = name;
         this.docsumDefSet = docsumDefinitionSet;
-        this.rankProfiles = ImmutableMap.copyOf(rankProfiles.stream().collect(Collectors.toMap(RankProfile::getName, p -> p)));
+        this.rankProfiles = Map.copyOf(rankProfiles.stream().collect(Collectors.toMap(RankProfile::getName, p -> p)));
     }
 
     public String getName() {
@@ -50,10 +47,6 @@ public class DocumentDatabase {
     /** Returns an unmodifiable map of all the rank profiles in this indexed by rank profile name */
     public Map<String, RankProfile> rankProfiles() { return rankProfiles; }
 
-    private static ImmutableMap<String, RankProfile> toMap(Collection<RankProfile> rankProfiles) {
-        return ImmutableMap.copyOf(rankProfiles.stream().collect(Collectors.toMap(RankProfile::getName, p -> p)));
-    }
-
     private static Collection<RankProfile> toRankProfiles(Collection<DocumentdbInfoConfig.Documentdb.Rankprofile> rankProfileConfigList) {
         List<RankProfile> rankProfiles = new ArrayList<>();
         for (DocumentdbInfoConfig.Documentdb.Rankprofile c : rankProfileConfigList)