diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/AwfulBukkitHacks.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/AwfulBukkitHacks.java
index 77e441d40..60622edf1 100644
--- a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/AwfulBukkitHacks.java
+++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/AwfulBukkitHacks.java
@@ -29,7 +29,6 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.VanillaBiomeProperties;
 import com.dfsek.terra.bukkit.world.BukkitBiomeInfo;
 import com.dfsek.terra.bukkit.world.BukkitPlatformBiome;
 import com.dfsek.terra.registry.master.ConfigRegistry;
diff --git a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSPlatform.java b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSPlatform.java
index 803f36ed8..8c8ed3992 100644
--- a/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSPlatform.java
+++ b/platforms/bukkit/nms/v1_21_9/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_9/NMSPlatform.java
@@ -50,17 +50,6 @@ import com.dfsek.terra.api.addon.BaseAddon;
 import com.dfsek.terra.api.world.biome.PlatformBiome;
 import com.dfsek.terra.bukkit.PlatformImpl;
 import com.dfsek.terra.bukkit.TerraBukkitPlugin;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeAdditionsSoundTemplate;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeMoodSoundTemplate;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.BiomeParticleConfigTemplate;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.EntityTypeTemplate;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.MusicSoundTemplate;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.SoundEventTemplate;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnCostConfig;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnEntryConfig;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnSettingsTemplate;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.SpawnTypeConfig;
-import com.dfsek.terra.bukkit.nms.v1_21_7.config.VillagerTypeTemplate;
 
 
 public class NMSPlatform extends PlatformImpl {
diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/generalize/ServerWorldMixin.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/generalize/ServerWorldMixin.java
index 364f6fbb6..470b0fa29 100644
--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/generalize/ServerWorldMixin.java
+++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/generalize/ServerWorldMixin.java
@@ -4,10 +4,10 @@ package com.dfsek.terra.mod.mixin.generalize;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.WorldGenerationProgressListener;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.random.RandomSequencesState;
 import net.minecraft.world.World;
+import net.minecraft.world.chunk.ChunkLoadProgress;
 import net.minecraft.world.dimension.DimensionOptions;
 import net.minecraft.world.dimension.DimensionTypes;
 import net.minecraft.world.level.ServerWorldProperties;
@@ -26,7 +26,7 @@ import java.util.concurrent.Executor;
 public abstract class ServerWorldMixin extends World {
     public ServerWorldMixin(MinecraftServer server, Executor workerExecutor, LevelStorage.Session session, ServerWorldProperties properties,
                             RegistryKey<World> worldKey, DimensionOptions dimensionOptions,
-                            WorldGenerationProgressListener worldGenerationProgressListener, boolean debugWorld, long seed,
+                            ChunkLoadProgress chunkLoadProgress, boolean debugWorld, long seed,
                             List<SpecialSpawner> spawners, boolean shouldTickTime, @Nullable RandomSequencesState randomSequencesState) {
         super(properties, worldKey, server.getRegistryManager(), dimensionOptions.dimensionTypeEntry(), false, debugWorld, seed,
             server.getMaxChainedNeighborUpdates());