diff --git a/test/unit/org/apache/cassandra/utils/CassandraGenerators.java b/test/unit/org/apache/cassandra/utils/CassandraGenerators.java
index 7d529fa319db..b95feea4004a 100644
--- a/test/unit/org/apache/cassandra/utils/CassandraGenerators.java
+++ b/test/unit/org/apache/cassandra/utils/CassandraGenerators.java
@@ -516,7 +516,6 @@ public Gen<KeyspaceMetadata> build()
                 AbstractReplicationStrategy replication = replicationGen.generate(rs).withKeyspace(nameGen).build(replicationType).generate(rs);
                 ReplicationParams replicationParams = ReplicationParams.fromStrategy(replication);
                 boolean durableWrites = durableWritesGen.generate(rs);
-                // TODO: Support tracked
                 KeyspaceParams params = new KeyspaceParams(durableWrites, replicationParams, FastPathStrategy.simple(), replicationType);
                 Tables tables = Tables.none();
                 Views views = Views.none();
@@ -958,7 +957,6 @@ public static class TableMetadataBuilder
         private Gen<Integer> numClusteringColumnsGen = SourceDSL.integers().between(1, 2);
         private Gen<Integer> numRegularColumnsGen = SourceDSL.integers().between(1, 5);
         private Gen<Integer> numStaticColumnsGen = SourceDSL.integers().between(0, 2);
-        private Gen<ReplicationType> replicationTypeGen = SourceDSL.arbitrary().enumValues(ReplicationType.class);
         @Nullable
         private ColumnNameGen columnNameGen = null;
         private TableParamsBuilder paramsBuilder = new TableParamsBuilder();
@@ -999,19 +997,6 @@ public TableMetadataBuilder withPartitioner(IPartitioner partitioner)
             return withPartitioner(i -> partitioner);
         }
 
-        public TableMetadataBuilder withReplicationType(Gen<ReplicationType> replicationTypeGen)
-        {
-            this.replicationTypeGen = Objects.requireNonNull(replicationTypeGen);
-            return this;
-        }
-
-        public TableMetadataBuilder withReplicationType(ReplicationType replicationType)
-        {
-            return withReplicationType(r -> replicationType);
-        }
-
-
-
         public TableMetadataBuilder withUseCounter(boolean useCounter)
         {
             return withUseCounter(ignore -> useCounter);
@@ -1199,12 +1184,10 @@ public TableMetadata build(RandomnessSource rnd)
                 String tableName = tableNameGen.generate(rnd);
                 TableParams params = paramsBuilder.build().generate(rnd);
                 boolean isCounter = useCounter.generate(rnd);
-                ReplicationType replicationType = replicationTypeGen.generate(rnd);
                 TableMetadata.Builder builder = TableMetadata.builder(ks, tableName, tableIdGen.generate(rnd))
                                                              .partitioner(partitionerGen.generate(rnd))
                                                              .kind(tableKindGen.generate(rnd))
                                                              .isCounter(isCounter)
-                                                             .keyspaceReplicationType(replicationType)
                                                              .params(params);
 
                 int numPartitionColumns = numPartitionColumnsGen.generate(rnd);