diff --git a/platforms/fabric/build.gradle.kts b/platforms/fabric/build.gradle.kts
index ce627df4f..c90bc19f0 100644
--- a/platforms/fabric/build.gradle.kts
+++ b/platforms/fabric/build.gradle.kts
@@ -26,8 +26,8 @@ dependencies {
 
     modImplementation("net.fabricmc:fabric-loader:${Versions.Mod.fabricLoader}")
 
-    modImplementation("org.incendo", "cloud-fabric", Versions.Fabric.cloud)
-    include("org.incendo", "cloud-fabric", Versions.Fabric.cloud)
+//    modImplementation("org.incendo", "cloud-fabric", Versions.Fabric.cloud)
+//    include("org.incendo", "cloud-fabric", Versions.Fabric.cloud)
 
     modRuntimeOnly("net.fabricmc.fabric-api", "fabric-api", Versions.Fabric.fabricAPI)
 }
diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/fix/BeeMoveGoalsUnsynchronizedRandomAccessFix.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/fix/BeeMoveGoalsUnsynchronizedRandomAccessFix.java
deleted file mode 100644
index 188e5b22c..000000000
--- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/fix/BeeMoveGoalsUnsynchronizedRandomAccessFix.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.dfsek.terra.mod.mixin.fix;
-
-import net.minecraft.entity.passive.BeeEntity.MoveToFlowerGoal;
-import net.minecraft.entity.passive.BeeEntity.MoveToHiveGoal;
-import net.minecraft.util.math.random.CheckedRandom;
-import net.minecraft.util.math.random.Random;
-import net.minecraft.world.World;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import com.dfsek.terra.mod.CommonPlatform;
-
-
-/**
- * Bees spawning uses world.random without synchronization. This causes issues when spawning bees during world generation.
- */
-@Mixin({
-    MoveToHiveGoal.class,
-    MoveToFlowerGoal.class
-})
-public class BeeMoveGoalsUnsynchronizedRandomAccessFix {
-    @Redirect(method = "<init>",
-              at = @At(value = "FIELD", target = "Lnet/minecraft/world/World;random:Lnet/minecraft/util/math/random/Random;"))
-    public Random redirectRandomAccess(World instance) {
-        return new CheckedRandom(CommonPlatform.get().getServer().getTicks()); // replace with new random seeded by tick time.
-    }
-}
diff --git a/platforms/mixin-common/src/main/resources/terra.common.mixins.json b/platforms/mixin-common/src/main/resources/terra.common.mixins.json
index 6cfe1161c..7ea2642ac 100644
--- a/platforms/mixin-common/src/main/resources/terra.common.mixins.json
+++ b/platforms/mixin-common/src/main/resources/terra.common.mixins.json
@@ -9,7 +9,6 @@
         "access.StateAccessor",
         "access.StructureAccessorAccessor",
         "access.VillagerTypeAccessor",
-        "fix.BeeMoveGoalsUnsynchronizedRandomAccessFix",
         "fix.NetherFossilOptimization",
         "implementations.compat.GenerationSettingsFloraFeaturesMixin",
         "implementations.terra.BiomeMixin",
diff --git a/platforms/mixin-lifecycle/build.gradle.kts b/platforms/mixin-lifecycle/build.gradle.kts
index 35461fc0a..e995c487c 100644
--- a/platforms/mixin-lifecycle/build.gradle.kts
+++ b/platforms/mixin-lifecycle/build.gradle.kts
@@ -15,10 +15,10 @@ dependencies {
     minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
     mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
 
-    modImplementation("org.incendo", "cloud-fabric", Versions.Fabric.cloud) {
-        exclude("net.fabricmc")
-        exclude("net.fabricmc.fabric-api")
-    }
+//    modImplementation("org.incendo", "cloud-fabric", Versions.Fabric.cloud) {
+//        exclude("net.fabricmc")
+//        exclude("net.fabricmc.fabric-api")
+//    }
 }
 
 loom {
diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java
index 48dc88249..010290641 100644
--- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java
+++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecycleEntryPoint.java
@@ -4,9 +4,9 @@ import com.dfsek.terra.api.command.CommandSender;
 import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
 
 import net.minecraft.server.command.ServerCommandSource;
-import org.incendo.cloud.SenderMapper;
-import org.incendo.cloud.execution.ExecutionCoordinator;
-import org.incendo.cloud.fabric.FabricServerCommandManager;
+//import org.incendo.cloud.SenderMapper;
+//import org.incendo.cloud.execution.ExecutionCoordinator;
+//import org.incendo.cloud.fabric.FabricServerCommandManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,16 +17,16 @@ public final class LifecycleEntryPoint {
     public static void initialize(String modName, LifecyclePlatform platform) {
         logger.info("Initializing Terra {} mod...", modName);
 
-        FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
-            ExecutionCoordinator.simpleCoordinator(),
-            SenderMapper.create(
-                serverCommandSource -> (CommandSender) serverCommandSource,
-                commandSender -> (ServerCommandSource) commandSender)
-        );
-
-
-        manager.brigadierManager().setNativeNumberSuggestions(false);
-
-        platform.getEventManager().callEvent(new CommandRegistrationEvent(manager));
+//        FabricServerCommandManager<CommandSender> manager = new FabricServerCommandManager<>(
+//            ExecutionCoordinator.simpleCoordinator(),
+//            SenderMapper.create(
+//                serverCommandSource -> (CommandSender) serverCommandSource,
+//                commandSender -> (ServerCommandSource) commandSender)
+//        );
+//
+//
+//        manager.brigadierManager().setNativeNumberSuggestions(false);
+//
+//        platform.getEventManager().callEvent(new CommandRegistrationEvent(manager));
     }
 }