diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/CompressorSubstitutions.java b/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/CompressorSubstitutions.java
index 889e4e1c137..f4578720f23 100644
--- a/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/CompressorSubstitutions.java
+++ b/core/src/main/java/com/datastax/oss/driver/internal/core/protocol/CompressorSubstitutions.java
@@ -21,7 +21,6 @@
 import com.datastax.oss.driver.api.core.context.DriverContext;
 import com.datastax.oss.driver.internal.core.util.GraalDependencyChecker;
 import com.datastax.oss.protocol.internal.Compressor;
-import com.oracle.svm.core.annotate.Delete;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import io.netty.buffer.ByteBuf;
@@ -82,14 +81,6 @@ public static Compressor<ByteBuf> newInstance(String name, DriverContext context
     }
   }
 
-  @TargetClass(value = Lz4Compressor.class, onlyWith = Lz4Missing.class)
-  @Delete
-  public static final class DeleteLz4Compressor {}
-
-  @TargetClass(value = SnappyCompressor.class)
-  @Delete
-  public static final class DeleteSnappyCompressor {}
-
   public static class Lz4Present implements BooleanSupplier {
     @Override
     public boolean getAsBoolean() {
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/util/Dependency.java b/core/src/main/java/com/datastax/oss/driver/internal/core/util/Dependency.java
index bbefe698d55..72db22e5c5b 100644
--- a/core/src/main/java/com/datastax/oss/driver/internal/core/util/Dependency.java
+++ b/core/src/main/java/com/datastax/oss/driver/internal/core/util/Dependency.java
@@ -15,7 +15,9 @@
  */
 package com.datastax.oss.driver.internal.core.util;
 
-import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * A set of driver optional dependencies and a common mechanism to test the presence of such
@@ -48,10 +50,10 @@ public enum Dependency {
   ;
 
   @SuppressWarnings("ImmutableEnumChecker")
-  private final ImmutableList<String> clzs;
+  private final List<String> clzs;
 
   Dependency(String... classNames) {
-    clzs = ImmutableList.copyOf(classNames);
+    clzs = Collections.unmodifiableList(Arrays.asList(classNames));
   }
 
   public Iterable<String> classes() {