diff --git a/core/trino-main/src/main/java/io/trino/util/SpatialJoinUtils.java b/core/trino-main/src/main/java/io/trino/util/SpatialJoinUtils.java
index 31aa83bf8a8a..3e748dfc8e5d 100644
--- a/core/trino-main/src/main/java/io/trino/util/SpatialJoinUtils.java
+++ b/core/trino-main/src/main/java/io/trino/util/SpatialJoinUtils.java
@@ -13,25 +13,15 @@
  */
 package io.trino.util;
 
-import io.trino.sql.planner.Symbol;
-import io.trino.sql.planner.plan.PlanNode;
 import io.trino.sql.tree.ComparisonExpression;
 import io.trino.sql.tree.Expression;
 import io.trino.sql.tree.FunctionCall;
-import io.trino.sql.tree.Literal;
-import io.trino.sql.tree.SymbolReference;
 
-import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
-import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static io.trino.metadata.ResolvedFunction.extractFunctionName;
 import static io.trino.sql.ExpressionUtils.extractConjuncts;
-import static io.trino.sql.tree.ComparisonExpression.Operator.LESS_THAN;
-import static io.trino.sql.tree.ComparisonExpression.Operator.LESS_THAN_OR_EQUAL;
 
 public final class SpatialJoinUtils
 {
@@ -108,59 +98,4 @@ private static boolean isSTDistance(Expression expression)
 
         return false;
     }
-
-    public static boolean isSpatialJoinFilter(PlanNode left, PlanNode right, Expression filterExpression)
-    {
-        List<FunctionCall> functionCalls = extractSupportedSpatialFunctions(filterExpression);
-        for (FunctionCall functionCall : functionCalls) {
-            if (isSpatialJoinFilter(left, right, functionCall)) {
-                return true;
-            }
-        }
-
-        List<ComparisonExpression> spatialComparisons = extractSupportedSpatialComparisons(filterExpression);
-        for (ComparisonExpression spatialComparison : spatialComparisons) {
-            if (spatialComparison.getOperator() == LESS_THAN || spatialComparison.getOperator() == LESS_THAN_OR_EQUAL) {
-                // ST_Distance(a, b) <= r
-                Expression radius = spatialComparison.getRight();
-                if (radius instanceof Literal || (radius instanceof SymbolReference && getSymbolReferences(right.getOutputSymbols()).contains(radius))) {
-                    if (isSpatialJoinFilter(left, right, (FunctionCall) spatialComparison.getLeft())) {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private static boolean isSpatialJoinFilter(PlanNode left, PlanNode right, FunctionCall spatialFunction)
-    {
-        List<Expression> arguments = spatialFunction.getArguments();
-        verify(arguments.size() == 2);
-        if (!(arguments.get(0) instanceof SymbolReference) || !(arguments.get(1) instanceof SymbolReference)) {
-            return false;
-        }
-
-        SymbolReference firstSymbol = (SymbolReference) arguments.get(0);
-        SymbolReference secondSymbol = (SymbolReference) arguments.get(1);
-
-        Set<SymbolReference> probeSymbols = getSymbolReferences(left.getOutputSymbols());
-        Set<SymbolReference> buildSymbols = getSymbolReferences(right.getOutputSymbols());
-
-        if (probeSymbols.contains(firstSymbol) && buildSymbols.contains(secondSymbol)) {
-            return true;
-        }
-
-        if (probeSymbols.contains(secondSymbol) && buildSymbols.contains(firstSymbol)) {
-            return true;
-        }
-
-        return false;
-    }
-
-    private static Set<SymbolReference> getSymbolReferences(Collection<Symbol> symbols)
-    {
-        return symbols.stream().map(Symbol::toSymbolReference).collect(toImmutableSet());
-    }
 }
diff --git a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryClientFactory.java b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryClientFactory.java
index 6caa312c26f0..f45bbac4e556 100644
--- a/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryClientFactory.java
+++ b/plugin/trino-bigquery/src/main/java/io/trino/plugin/bigquery/BigQueryClientFactory.java
@@ -47,7 +47,7 @@ public BigQueryClientFactory(
             ViewMaterializationCache materializationCache,
             HeaderProvider headerProvider)
     {
-        this.identityCacheMapping = requireNonNull(identityCacheMapping, "identityCacheMaping is null");
+        this.identityCacheMapping = requireNonNull(identityCacheMapping, "identityCacheMapping is null");
         this.credentialsSupplier = requireNonNull(credentialsSupplier, "credentialsSupplier is null");
         this.bigQueryConfig = requireNonNull(bigQueryConfig, "bigQueryConfig is null");
         this.materializationCache = requireNonNull(materializationCache, "materializationCache is null");
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotMetadata.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotMetadata.java
index cc113b8715c1..d304f52e7267 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotMetadata.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/PinotMetadata.java
@@ -494,10 +494,6 @@ private List<String> getPinotTableNames()
 
     private static <K, V> V getFromCache(LoadingCache<K, V> cache, K key)
     {
-        V value = cache.getIfPresent(key);
-        if (value != null) {
-            return value;
-        }
         try {
             return cache.get(key);
         }
diff --git a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotClient.java b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotClient.java
index 6cc8377a6b01..605f2e8d72d9 100755
--- a/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotClient.java
+++ b/plugin/trino-pinot/src/main/java/io/trino/plugin/pinot/client/PinotClient.java
@@ -140,14 +140,13 @@ public PinotClient(
                 .build((CacheLoader.from(this::getAllBrokersForTable)));
     }
 
-    public static JsonCodecBinder addJsonBinders(JsonCodecBinder jsonCodecBinder)
+    public static void addJsonBinders(JsonCodecBinder jsonCodecBinder)
     {
         jsonCodecBinder.bindJsonCodec(GetTables.class);
         jsonCodecBinder.bindJsonCodec(BrokersForTable.InstancesInBroker.class);
         jsonCodecBinder.bindJsonCodec(BrokersForTable.class);
         jsonCodecBinder.bindJsonCodec(TimeBoundary.class);
         jsonCodecBinder.bindJsonCodec(BrokerResponseNative.class);
-        return jsonCodecBinder;
     }
 
     protected <T> T doHttpActionWithHeadersJson(Request.Builder requestBuilder, Optional<String> requestBody, JsonCodec<T> codec)