diff --git a/NitroxClient/Communication/Packets/Processors/PlayerMovementProcessor.cs b/NitroxClient/Communication/Packets/Processors/PlayerMovementProcessor.cs
index 6b7ab5d142..5c37c4227f 100644
--- a/NitroxClient/Communication/Packets/Processors/PlayerMovementProcessor.cs
+++ b/NitroxClient/Communication/Packets/Processors/PlayerMovementProcessor.cs
@@ -1,7 +1,5 @@
 using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.GameLogic;
-using NitroxModel.Packets;
-using NitroxModel_Subnautica.DataStructures;
 
 namespace NitroxClient.Communication.Packets.Processors;
 
diff --git a/NitroxPatcher/Patches/Dynamic/SubFire_EngineOverheatSimulation_Patch.cs b/NitroxPatcher/Patches/Dynamic/SubFire_EngineOverheatSimulation_Patch.cs
deleted file mode 100644
index 5d4b38fada..0000000000
--- a/NitroxPatcher/Patches/Dynamic/SubFire_EngineOverheatSimulation_Patch.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-# if DEBUG
-using System.Reflection;
-using NitroxModel.Helper;
-
-namespace NitroxPatcher.Patches.Dynamic;
-
-/// <summary>
-/// Disables cyclops overheating from moving while in creative mode (really annoying for no reason)
-/// </summary>
-public sealed partial class SubFire_EngineOverheatSimulation_Patch : NitroxPatch, IDynamicPatch
-{
-    private static readonly MethodInfo TARGET_METHOD = Reflect.Method((SubFire t) => t.EngineOverheatSimulation());
-
-    public static bool Prefix()
-    {
-        if ((GameModeUtils.currentGameMode & GameModeOption.Creative) != 0)
-        {
-            return false;
-        }
-        return true;
-    }
-}
-#endif
diff --git a/NitroxPatcher/Patches/Dynamic/SubFire_FireSimulation_Patch.cs b/NitroxPatcher/Patches/Dynamic/SubFire_FireSimulation_Patch.cs
deleted file mode 100644
index 79a5c3123a..0000000000
--- a/NitroxPatcher/Patches/Dynamic/SubFire_FireSimulation_Patch.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-# if DEBUG
-using System.Reflection;
-using NitroxModel.Helper;
-
-namespace NitroxPatcher.Patches.Dynamic;
-
-/// <summary>
-/// Disables cyclops overheating from moving while in creative mode (really annoying for no reason)
-/// </summary>
-public sealed partial class SubFire_FireSimulation_Patch : NitroxPatch, IDynamicPatch
-{
-    private static readonly MethodInfo TARGET_METHOD = Reflect.Method((SubFire t) => t.FireSimulation());
-
-    public static bool Prefix() => SubFire_EngineOverheatSimulation_Patch.Prefix();
-}
-#endif
diff --git a/NitroxPatcher/Patches/Persistent/uGUI_MainMenu_Start_Patch.cs b/NitroxPatcher/Patches/Persistent/uGUI_MainMenu_Start_Patch.cs
index 876020e616..087ab93bf8 100644
--- a/NitroxPatcher/Patches/Persistent/uGUI_MainMenu_Start_Patch.cs
+++ b/NitroxPatcher/Patches/Persistent/uGUI_MainMenu_Start_Patch.cs
@@ -7,6 +7,7 @@
 
 namespace NitroxPatcher.Patches.Persistent;
 
+// TODO: Rework this to be less ad hoc and more robust with command line arguments
 public sealed partial class uGUI_MainMenu_Start_Patch : NitroxPatch, IPersistentPatch
 {
     private static readonly MethodInfo TARGET_METHOD_ENUMERATOR = Reflect.Method((uGUI_MainMenu t) => t.Start());