diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinTracingExecutor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinTracingExecutor.java
index a35e4e759..586ac2bd1 100644
--- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinTracingExecutor.java
+++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinTracingExecutor.java
@@ -29,7 +29,7 @@ import org.spongepowered.asm.mixin.Mixin;
  *
  * @see MixinUtilBackgroundThread
  */
-@Mixin(net.minecraft.Util.class) // TODO we should allow version specific mixins so we don't have to create dummy mixins that exist for all MC versions
+@Mixin(net.minecraft.Util.class)
 public class MixinTracingExecutor
 {
 	
diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestChunkWorldGenerator.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestChunkWorldGenerator.java
index 88883d48b..0313eb257 100644
--- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestChunkWorldGenerator.java
+++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestChunkWorldGenerator.java
@@ -10,11 +10,16 @@ import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
 import com.seibel.distanthorizons.api.objects.data.DhApiChunk;
 import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.QuartPos;
+
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.chunk.ChunkAccess;
 
+#if MC_VER >= MC_1_18_2
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.QuartPos;
+#endif
+
+
 import java.util.ArrayList;
 
 public class TestChunkWorldGenerator extends AbstractDhApiChunkWorldGenerator
diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinClientPacketListener.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinClientPacketListener.java
index 2726de266..fa927b2b4 100644
--- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinClientPacketListener.java
+++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinClientPacketListener.java
@@ -11,8 +11,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(ClientPacketListener.class)
 public class MixinClientPacketListener
 {
-	// TODO update fabric version as well
-	
 	@Inject(method = "handleLogin", at = @At("RETURN"))
 	void onHandleLoginEnd(CallbackInfo ci) { ClientApi.INSTANCE.onClientOnlyConnected(); }
 	
@@ -21,9 +19,6 @@ public class MixinClientPacketListener
 	#else
 	@Inject(method = "close", at = @At("HEAD"))
 	#endif
-	void onCleanupStart(CallbackInfo ci)
-	{
-		ClientApi.INSTANCE.onClientOnlyDisconnected();
-	}
+	void onCleanupStart(CallbackInfo ci) { ClientApi.INSTANCE.onClientOnlyDisconnected(); }
 	
 }
diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java
index 173d8043f..3ff822424 100644
--- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java
+++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java
@@ -41,8 +41,6 @@ import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.FogType;
 #endif
 
-
-
 @Mixin(FogRenderer.class)
 public class MixinFogRenderer
 {
diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java
index 7df96bd64..991ea8709 100644
--- a/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java
+++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java
@@ -76,11 +76,6 @@ public class MixinLevelRenderer
 	@Unique
 	private static float previousPartialTicks = 0;
 	
-	// TODO: Is there any reason why this is here? Can it be deleted?
-	public MixinLevelRenderer()
-	{
-		throw new NullPointerException("Null cannot be cast to non-null type.");
-	}
 	
 	#if MC_VER < MC_1_17_1
 	@Inject(at = @At("RETURN"), method = "renderSky(Lcom/mojang/blaze3d/vertex/PoseStack;F)V")
diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/server/MixinTracingExecutor.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/server/MixinTracingExecutor.java
index 51abf0a5f..8a359cff4 100644
--- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/server/MixinTracingExecutor.java
+++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/server/MixinTracingExecutor.java
@@ -28,7 +28,7 @@ import org.spongepowered.asm.mixin.Mixin;
  *
  * @see MixinUtilBackgroundThread
  */
-@Mixin(net.minecraft.Util.class) // TODO we should allow version specific mixins so we don't have to create dummy mixins that exist for all MC versions
+@Mixin(net.minecraft.Util.class)
 public class MixinTracingExecutor
 {