diff --git a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSession.java b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSession.java
index 67677b6323f1..12ae07bd764d 100644
--- a/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSession.java
+++ b/plugin/trino-cassandra/src/main/java/io/trino/plugin/cassandra/CassandraSession.java
@@ -395,11 +395,6 @@ public List<CassandraPartition> getPartitions(CassandraTable table, List<Set<Obj
             rows = queryPartitionKeysLegacyWithMultipleQueries(table, filterPrefixes);
         }
 
-        if (rows == null) {
-            // just split the whole partition range
-            return ImmutableList.of(CassandraPartition.UNPARTITIONED);
-        }
-
         ByteBuffer buffer = ByteBuffer.allocate(1000);
         HashMap<ColumnHandle, NullableValue> map = new HashMap<>();
         Set<String> uniquePartitionIds = new HashSet<>();
@@ -489,7 +484,7 @@ private Iterable<Row> queryPartitionKeysLegacyWithMultipleQueries(CassandraTable
 
             log.debug("Execute cql for partition keys with multiple queries: %s", partitionKeys);
             List<Row> resultRows = execute(partitionKeys.build()).all();
-            if (resultRows != null && !resultRows.isEmpty()) {
+            if (!resultRows.isEmpty()) {
                 rowList.addAll(resultRows);
             }
         }
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalog.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalog.java
index 4afaedd99bc3..c2df01dd6abb 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalog.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/catalog/hms/TrinoHiveCatalog.java
@@ -473,7 +473,7 @@ public void createMaterializedView(
                 .setViewExpandedText(Optional.of("/* " + ICEBERG_MATERIALIZED_VIEW_COMMENT + " */"));
         io.trino.plugin.hive.metastore.Table table = tableBuilder.build();
         PrincipalPrivileges principalPrivileges = isUsingSystemSecurity ? NO_PRIVILEGES : buildInitialPrivilegeSet(session.getUser());
-        if (existing.isPresent() && replace) {
+        if (existing.isPresent()) {
             // drop the current storage table
             String oldStorageTable = existing.get().getParameters().get(STORAGE_TABLE);
             if (oldStorageTable != null) {
diff --git a/service/trino-verifier/src/main/java/io/trino/verifier/Validator.java b/service/trino-verifier/src/main/java/io/trino/verifier/Validator.java
index 1d87bf80e829..3725d2215148 100644
--- a/service/trino-verifier/src/main/java/io/trino/verifier/Validator.java
+++ b/service/trino-verifier/src/main/java/io/trino/verifier/Validator.java
@@ -716,7 +716,7 @@ private static Comparator<Object> columnComparator(int precision)
             if (a.getClass() != b.getClass()) {
                 throw new TypesDoNotMatchException(format("item types do not match: %s vs %s", a.getClass().getName(), b.getClass().getName()));
             }
-            if ((a.getClass().isArray() && b.getClass().isArray())) {
+            if (a.getClass().isArray()) {
                 Object[] aArray = (Object[]) a;
                 Object[] bArray = (Object[]) b;