diff --git a/src/mars_patcher/auto_generated_types.py b/src/mars_patcher/auto_generated_types.py
index 2f0d946..11fad8a 100644
--- a/src/mars_patcher/auto_generated_types.py
+++ b/src/mars_patcher/auto_generated_types.py
@@ -626,9 +626,6 @@ class Marsschema(typ.TypedDict, total=False):
     PowerBombsWithoutBombs: bool = False
     """When enabled, lets you use Power Bombs without needing to collect Bomb Data."""
 
-    AntiSoftlockRoomEdits: bool = False
-    """Changes room layouts when enabled to prevent some accidental softlocks."""
-
     AccessibilityPatches: bool = False
     """Whether to apply patches for better accessibility."""
 
diff --git a/src/mars_patcher/data/schema.json b/src/mars_patcher/data/schema.json
index 1cb0b73..f2a5290 100644
--- a/src/mars_patcher/data/schema.json
+++ b/src/mars_patcher/data/schema.json
@@ -586,11 +586,6 @@
             "description": "When enabled, lets you use Power Bombs without needing to collect Bomb Data.",
             "default": false
         },
-        "AntiSoftlockRoomEdits": {
-            "type": "boolean",
-            "description": "Changes room layouts when enabled to prevent some accidental softlocks.",
-            "default": false
-        },
         "AccessibilityPatches": {
             "type": "boolean",
             "description": "Whether to apply patches for better accessibility.",
diff --git a/src/mars_patcher/misc_patches.py b/src/mars_patcher/misc_patches.py
index 3e52c37..99b6238 100644
--- a/src/mars_patcher/misc_patches.py
+++ b/src/mars_patcher/misc_patches.py
@@ -81,10 +81,6 @@ def apply_pbs_without_bombs(rom: Rom) -> None:
     apply_patch_in_asm_path(rom, "bombless_pbs.ips")
 
 
-def apply_anti_softlock_edits(rom: Rom) -> None:
-    apply_patch_in_asm_path(rom, "anti_softlock.ips")
-
-
 def apply_reveal_hidden_tiles(rom: Rom) -> None:
     rom.write_8(rom.read_ptr(ReservedConstants.REVEAL_HIDDEN_TILES_ADDR), 1)
 
diff --git a/src/mars_patcher/patcher.py b/src/mars_patcher/patcher.py
index 69df376..d6d4e24 100644
--- a/src/mars_patcher/patcher.py
+++ b/src/mars_patcher/patcher.py
@@ -16,7 +16,6 @@
 from mars_patcher.minimap import apply_base_minimap_edits, apply_minimap_edits
 from mars_patcher.misc_patches import (
     apply_accessibility_patch,
-    apply_anti_softlock_edits,
     apply_base_patch,
     apply_pbs_without_bombs,
     apply_reveal_hidden_tiles,
@@ -76,10 +75,6 @@ def patch(
     # Apply base asm patch first
     apply_base_patch(rom)
 
-    # Softlock edits need to be done early to prevent later edits messing things up.
-    if patch_data.get("AntiSoftlockRoomEdits"):
-        apply_anti_softlock_edits(rom)
-
     # Randomize palettes - palettes are randomized first in case the item
     # patcher needs to copy tilesets
     if "Palettes" in patch_data: