diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0858a8d860..3741a4dfe6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -70,7 +70,6 @@ jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version
 jakarta-validation-api = { module = "jakarta.validation:jakarta.validation-api", version = "3.1.1" }
 jakarta-ws-rs-api = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version = "4.0.0" }
 javax-servlet-api = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" }
-jetbrains-annotations = { module = "org.jetbrains:annotations", version = "26.0.2" }
 junit-bom = { module = "org.junit:junit-bom", version = "5.12.1" }
 logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.5.17" }
 micrometer-bom = { module = "io.micrometer:micrometer-bom", version = "1.14.5" }
diff --git a/polaris-core/build.gradle.kts b/polaris-core/build.gradle.kts
index 8adfa82fa7..e16037a011 100644
--- a/polaris-core/build.gradle.kts
+++ b/polaris-core/build.gradle.kts
@@ -41,7 +41,6 @@ dependencies {
   implementation(libs.commons.codec1)
   implementation(libs.guava)
   implementation(libs.slf4j.api)
-  compileOnly(libs.jetbrains.annotations)
   compileOnly(libs.spotbugs.annotations)
 
   compileOnly(project(":polaris-immutables"))
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/PolarisDefaultDiagServiceImpl.java b/polaris-core/src/main/java/org/apache/polaris/core/PolarisDefaultDiagServiceImpl.java
index 644bd10e02..7adb608b78 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/PolarisDefaultDiagServiceImpl.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/PolarisDefaultDiagServiceImpl.java
@@ -20,7 +20,6 @@
 
 import com.google.common.base.Preconditions;
 import java.util.Arrays;
-import org.jetbrains.annotations.Contract;
 
 /** Default implementation of the PolarisDiagServices. */
 public class PolarisDefaultDiagServiceImpl implements PolarisDiagnostics {
@@ -67,7 +66,6 @@ public RuntimeException fail(
    * @return the non-null reference that was validated
    * @throws RuntimeException if `reference` is null
    */
-  @Contract("null, _ -> fail")
   @Override
   public <T> T checkNotNull(final T reference, final String signature) {
     return Preconditions.checkNotNull(reference, signature);
@@ -85,7 +83,6 @@ public <T> T checkNotNull(final T reference, final String signature) {
    * @return the non-null reference that was validated
    * @throws RuntimeException if `reference` is null
    */
-  @Contract("null, _, _, _ -> fail")
   @Override
   public <T> T checkNotNull(
       final T reference,
@@ -104,7 +101,6 @@ public <T> T checkNotNull(
    *     like "path_cannot_be_null"
    * @throws RuntimeException if `condition` is not true
    */
-  @Contract("false, _ -> fail")
   @Override
   public void check(final boolean expression, final String signature) {
     Preconditions.checkState(expression, signature);
@@ -121,7 +117,6 @@ public void check(final boolean expression, final String signature) {
    * @param extraInfoArgs extra information arguments
    * @throws RuntimeException if condition` is not true
    */
-  @Contract("false, _, _, _ -> fail")
   @Override
   public void check(
       final boolean expression,
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/PolarisDiagnostics.java b/polaris-core/src/main/java/org/apache/polaris/core/PolarisDiagnostics.java
index 59a5292028..69eeb68489 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/PolarisDiagnostics.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/PolarisDiagnostics.java
@@ -18,8 +18,6 @@
  */
 package org.apache.polaris.core;
 
-import org.jetbrains.annotations.Contract;
-
 public interface PolarisDiagnostics {
 
   /**
@@ -31,7 +29,6 @@ public interface PolarisDiagnostics {
    *     pairs: "id={} fileName={}"
    * @param extraInfoArgs extra information arguments
    */
-  @Contract("_, _, _ -> fail")
   RuntimeException fail(
       final String signature, final String extraInfoFormat, final Object... extraInfoArgs);
 
@@ -45,7 +42,6 @@ RuntimeException fail(
    *     pairs: "id={} fileName={}"
    * @param extraInfoArgs extra information arguments
    */
-  @Contract("_, _, _, _ -> fail")
   RuntimeException fail(
       final String signature,
       final Throwable cause,
@@ -61,7 +57,6 @@ RuntimeException fail(
    * @return the non-null reference that was validated
    * @throws RuntimeException if `reference` is null
    */
-  @Contract("null, _ -> fail")
   <T> T checkNotNull(final T reference, final String signature);
 
   /**
@@ -76,7 +71,6 @@ RuntimeException fail(
    * @return the non-null reference that was validated
    * @throws RuntimeException if `reference` is null
    */
-  @Contract("null, _, _, _ -> fail")
   <T> T checkNotNull(
       final T reference,
       final String signature,
@@ -91,7 +85,6 @@ <T> T checkNotNull(
    *     like "path_cannot_be_null"
    * @throws RuntimeException if `condition` is not true
    */
-  @Contract("false, _ -> fail")
   void check(final boolean expression, final String signature);
 
   /**
@@ -105,7 +98,6 @@ <T> T checkNotNull(
    * @param extraInfoArgs extra information arguments
    * @throws RuntimeException if `condition` is not true
    */
-  @Contract("false, _, _, _ -> fail")
   void check(
       final boolean expression,
       final String signature,
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/storage/cache/StorageCredentialCache.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/cache/StorageCredentialCache.java
index 10b239da30..3fe5931950 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/storage/cache/StorageCredentialCache.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/cache/StorageCredentialCache.java
@@ -21,6 +21,7 @@
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.Expiry;
 import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.google.common.annotations.VisibleForTesting;
 import jakarta.annotation.Nonnull;
 import java.time.Duration;
 import java.util.Map;
@@ -35,7 +36,6 @@
 import org.apache.polaris.core.entity.PolarisEntityType;
 import org.apache.polaris.core.persistence.dao.entity.ScopedCredentialsResult;
 import org.apache.polaris.core.storage.PolarisCredentialVendor;
-import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;