diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorHandleResolver.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorHandleResolver.java
deleted file mode 100644
index 43af9a70a455..000000000000
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorHandleResolver.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.trino.spi.connector;
-
-import java.util.LinkedHashSet;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@Deprecated
-public interface ConnectorHandleResolver
-{
-    default Class<? extends ConnectorTableHandle> getTableHandleClass()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    default Class<? extends ColumnHandle> getColumnHandleClass()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    default Class<? extends ConnectorSplit> getSplitClass()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    default Class<? extends ConnectorIndexHandle> getIndexHandleClass()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    default Class<? extends ConnectorOutputTableHandle> getOutputTableHandleClass()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    default Class<? extends ConnectorInsertTableHandle> getInsertTableHandleClass()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    default Class<? extends ConnectorTableExecuteHandle> getTableExecuteHandleClass()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    default Class<? extends ConnectorPartitioningHandle> getPartitioningHandleClass()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    default Class<? extends ConnectorTransactionHandle> getTransactionHandleClass()
-    {
-        throw new UnsupportedOperationException();
-    }
-
-    default Set<Class<?>> getHandleClasses()
-    {
-        return Stream.of(
-                value(this::getTableHandleClass),
-                value(this::getColumnHandleClass),
-                value(this::getSplitClass),
-                value(this::getIndexHandleClass),
-                value(this::getOutputTableHandleClass),
-                value(this::getInsertTableHandleClass),
-                value(this::getTableExecuteHandleClass),
-                value(this::getPartitioningHandleClass),
-                value(this::getTransactionHandleClass))
-                .flatMap(Optional::stream)
-                .collect(Collectors.toCollection(LinkedHashSet::new));
-    }
-
-    private static Optional<Class<?>> value(Supplier<Class<?>> supplier)
-    {
-        try {
-            return Optional.of(supplier.get());
-        }
-        catch (UnsupportedOperationException e) {
-            return Optional.empty();
-        }
-    }
-}
diff --git a/docs/src/main/sphinx/develop/connectors.rst b/docs/src/main/sphinx/develop/connectors.rst
index 3d9f0e6d06cd..ae8d428ad7c5 100644
--- a/docs/src/main/sphinx/develop/connectors.rst
+++ b/docs/src/main/sphinx/develop/connectors.rst
@@ -18,7 +18,6 @@ following services:
 
 * ``ConnectorMetadata``
 * ``ConnectorSplitManager``
-* ``ConnectorHandleResolver``
 * ``ConnectorRecordSetProvider``
 
 ConnectorMetadata
diff --git a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeHandleResolver.java b/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeHandleResolver.java
deleted file mode 100644
index 850efcc848e2..000000000000
--- a/plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/DeltaLakeHandleResolver.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.trino.plugin.deltalake;
-
-import io.trino.plugin.deltalake.procedure.DeltaLakeTableExecuteHandle;
-import io.trino.plugin.hive.HiveTransactionHandle;
-import io.trino.spi.connector.ColumnHandle;
-import io.trino.spi.connector.ConnectorHandleResolver;
-import io.trino.spi.connector.ConnectorInsertTableHandle;
-import io.trino.spi.connector.ConnectorOutputTableHandle;
-import io.trino.spi.connector.ConnectorPartitioningHandle;
-import io.trino.spi.connector.ConnectorSplit;
-import io.trino.spi.connector.ConnectorTableExecuteHandle;
-import io.trino.spi.connector.ConnectorTableHandle;
-import io.trino.spi.connector.ConnectorTransactionHandle;
-
-public class DeltaLakeHandleResolver
-        implements ConnectorHandleResolver
-{
-    @Override
-    public Class<? extends ConnectorTableHandle> getTableHandleClass()
-    {
-        return DeltaLakeTableHandle.class;
-    }
-
-    @Override
-    public Class<? extends ColumnHandle> getColumnHandleClass()
-    {
-        return DeltaLakeColumnHandle.class;
-    }
-
-    @Override
-    public Class<? extends ConnectorSplit> getSplitClass()
-    {
-        return DeltaLakeSplit.class;
-    }
-
-    @Override
-    public Class<? extends ConnectorOutputTableHandle> getOutputTableHandleClass()
-    {
-        return DeltaLakeOutputTableHandle.class;
-    }
-
-    @Override
-    public Class<? extends ConnectorInsertTableHandle> getInsertTableHandleClass()
-    {
-        return DeltaLakeInsertTableHandle.class;
-    }
-
-    @Override
-    public Class<? extends ConnectorTableExecuteHandle> getTableExecuteHandleClass()
-    {
-        return DeltaLakeTableExecuteHandle.class;
-    }
-
-    @Override
-    public Class<? extends ConnectorTransactionHandle> getTransactionHandleClass()
-    {
-        return HiveTransactionHandle.class;
-    }
-
-    @Override
-    public Class<? extends ConnectorPartitioningHandle> getPartitioningHandleClass()
-    {
-        return DeltaLakePartitioningHandle.class;
-    }
-}