diff --git a/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/KafkaStoreIngestionService.java b/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/KafkaStoreIngestionService.java
index 60618884ad..776c589660 100644
--- a/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/KafkaStoreIngestionService.java
+++ b/clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/KafkaStoreIngestionService.java
@@ -18,7 +18,6 @@
 import static java.lang.Thread.currentThread;
 import static java.lang.Thread.sleep;
 
-import com.google.common.collect.ImmutableMap;
 import com.linkedin.davinci.compression.StorageEngineBackedCompressorFactory;
 import com.linkedin.davinci.config.VeniceConfigLoader;
 import com.linkedin.davinci.config.VeniceServerConfig;
@@ -428,7 +427,7 @@ public void handleStoreDeleted(Store store) {
               serverConfig.getLocalControllerD2ServiceName(),
               serverConfig.getLocalD2ZkHost(),
               false)) {
-        schemaInitializer.execute(ImmutableMap.of(schemaId, schema));
+        schemaInitializer.execute(Collections.singletonMap(schemaId, schema));
       } catch (VeniceException e) {
         LOGGER.error(
             "Exception in registering '{}' schema version '{}'",
diff --git a/services/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceControllerService.java b/services/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceControllerService.java
index da32363401..2d102226f3 100644
--- a/services/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceControllerService.java
+++ b/services/venice-controller/src/main/java/com/linkedin/venice/controller/VeniceControllerService.java
@@ -2,7 +2,6 @@
 
 import static com.linkedin.venice.client.store.ClientFactory.getSchemaReader;
 
-import com.google.common.collect.ImmutableMap;
 import com.linkedin.d2.balancer.D2Client;
 import com.linkedin.venice.SSLConfig;
 import com.linkedin.venice.acl.DynamicAccessController;
@@ -31,6 +30,7 @@
 import com.linkedin.venice.utils.pools.LandFillObjectPool;
 import io.tehuti.metrics.MetricsRepository;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -150,7 +150,7 @@ public VeniceControllerService(
                 systemStoreClusterConfig.getChildControllerD2ZkHost(systemStoreClusterConfig.getRegionName()),
                 systemStoreClusterConfig.isControllerEnforceSSLOnly());
 
-        schemaInitializer.execute(ImmutableMap.of(schemaId, schema));
+        schemaInitializer.execute(Collections.singletonMap(schemaId, schema));
       } catch (VeniceException e) {
         LOGGER.error(
             "Exception in registering '{}' schema version '{}'",