diff --git a/polaris-core/src/main/java/org/apache/polaris/core/PolarisConfigurationStore.java b/polaris-core/src/main/java/org/apache/polaris/core/PolarisConfigurationStore.java
index 2c6c73f5b..a3c902206 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/PolarisConfigurationStore.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/PolarisConfigurationStore.java
@@ -23,7 +23,6 @@
 import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
-import org.apache.polaris.core.context.CallContext;
 import org.apache.polaris.core.entity.CatalogEntity;
 
 /**
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsStorageConfigurationInfo.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsStorageConfigurationInfo.java
index 9b8cbd1da..8cfaa19dc 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsStorageConfigurationInfo.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsStorageConfigurationInfo.java
@@ -28,7 +28,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.polaris.core.PolarisConfiguration;
-import org.apache.polaris.core.PolarisConfigurationStore;
 import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
 
 /** Aws Polaris Storage Configuration information */
@@ -74,8 +73,7 @@ public AwsStorageConfigurationInfo(
     this.externalId = externalId;
     this.region = region;
     validateMaxAllowedLocations(
-        PolarisConfiguration.loadConfig(
-            PolarisConfiguration.STORAGE_CONFIGURATION_MAX_LOCATIONS));
+        PolarisConfiguration.loadConfig(PolarisConfiguration.STORAGE_CONFIGURATION_MAX_LOCATIONS));
   }
 
   @Override
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureStorageConfigurationInfo.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureStorageConfigurationInfo.java
index ac6dfc349..907198310 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureStorageConfigurationInfo.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureStorageConfigurationInfo.java
@@ -26,7 +26,6 @@
 import java.util.List;
 import java.util.Objects;
 import org.apache.polaris.core.PolarisConfiguration;
-import org.apache.polaris.core.PolarisConfigurationStore;
 import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
 
 /** Azure storage configuration information. */
@@ -51,8 +50,7 @@ public AzureStorageConfigurationInfo(
     super(StorageType.AZURE, allowedLocations);
     this.tenantId = tenantId;
     validateMaxAllowedLocations(
-        PolarisConfiguration.loadConfig(
-            PolarisConfiguration.STORAGE_CONFIGURATION_MAX_LOCATIONS));
+        PolarisConfiguration.loadConfig(PolarisConfiguration.STORAGE_CONFIGURATION_MAX_LOCATIONS));
   }
 
   @Override
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpStorageConfigurationInfo.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpStorageConfigurationInfo.java
index ead467057..64117cee1 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpStorageConfigurationInfo.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpStorageConfigurationInfo.java
@@ -25,7 +25,6 @@
 import jakarta.annotation.Nullable;
 import java.util.List;
 import org.apache.polaris.core.PolarisConfiguration;
-import org.apache.polaris.core.PolarisConfigurationStore;
 import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo;
 
 /** Gcp storage storage configuration information. */
@@ -41,8 +40,7 @@ public GcpStorageConfigurationInfo(
           List<String> allowedLocations) {
     super(StorageType.GCS, allowedLocations);
     validateMaxAllowedLocations(
-        PolarisConfiguration.loadConfig(
-            PolarisConfiguration.STORAGE_CONFIGURATION_MAX_LOCATIONS));
+        PolarisConfiguration.loadConfig(PolarisConfiguration.STORAGE_CONFIGURATION_MAX_LOCATIONS));
   }
 
   @Override