diff --git a/EntranceShuffle.py b/EntranceShuffle.py
index 52a002c4..38e59fa1 100644
--- a/EntranceShuffle.py
+++ b/EntranceShuffle.py
@@ -1023,11 +1023,9 @@ DW_Entrances = ['Bumper Cave (Bottom)',
                 'Hookshot Cave']
 
 Blacksmith_Single_Cave_Doors = ['Thiefs Hut',
-                                'Bonk Fairy (Light)',
                                 'Lake Hylia Fairy',
                                 'Swamp Fairy',
                                 'Desert Fairy',
-                                'Kings Grave',
                                 'Chicken House',
                                 'Aginahs Cave',
                                 'Sahasrahlas Hut',
@@ -1042,27 +1040,29 @@ Blacksmith_Single_Cave_Doors = ['Thiefs Hut',
                                 'Tavern (Front)',
                                 'Light World Bomb Hut',
                                 'Kakariko Shop',
-                                'Cave South of Haunted Grove',
-                                'Graveyard Cave',
-                                'Checkerboard Cave',
                                 'Mini Moldorm Cave',
                                 'Long Fairy Cave',
                                 'Good Bee Cave',
                                 '20 Rupee Cave',
                                 '50 Rupee Cave',
                                 'Ice Cave',
-                                'Bonk Rock Cave',
                                 'Library',
                                 'Witch Hut',
-                                'Hookshot Fairy',
-                                'Waterfall of Wishing',
-                                'Capacity Upgrade',
                                 'Dam',
                                 'Lumberjack House',
                                 'Lake Hylia Fortune Teller',
                                 'Kakariko Gamble Game']
 
-Bomb_Shop_Single_Cave_Doors = ['East Dark World Hint',
+Bomb_Shop_Single_Cave_Doors = ['Waterfall of Wishing',
+                               'Capacity Upgrade',
+                               'Bonk Rock Cave',
+                               'Graveyard Cave',
+                               'Checkerboard Cave',
+                               'Cave South of Haunted Grove',
+                               'Kings Grave',
+                               'Bonk Fairy (Light)',
+                               'Hookshot Fairy',
+                               'East Dark World Hint',
                                'Palace of Darkness Hint',
                                'Dark Lake Hylia Fairy',
                                'Dark Lake Hylia Ledge Fairy',
diff --git a/Rules.py b/Rules.py
index 7e47fc35..186eaabf 100644
--- a/Rules.py
+++ b/Rules.py
@@ -22,7 +22,6 @@ def set_rules(world):
         # require altar for ganon to enforce getting everything
         add_rule(world.get_location('Ganon'), lambda state: state.can_reach('Altar', 'Location'))
 
-    set_blacksmith_rules(world)
     set_big_bomb_rules(world)
 
     # if swamp and dam have not been moved we require mirror for swamp palace
@@ -384,13 +383,6 @@ def standard_rules(world):
     add_rule(world.get_location('[dungeon-C-B1] Escape - First B1 Room'), lambda state: state.can_reach('Sewer Drop') or (state.world.get_location('[dungeon-C-B1] Escape - First B1 Room').item is not None and state.world.get_location('[dungeon-C-B1] Escape - First B1 Room').item.name in ['Small Key (Escape)']))  # you could skip this chest and be unable to go back until you can drop into escape
 
 
-def set_blacksmith_rules(world):
-    blacksmith_entrance = world.get_region('Blacksmiths Hut').entrances[0]
-    # some special handling if shuffled as we cannot use connected caves to take the smith up to death mountain
-    if blacksmith_entrance.name == 'Hookshot Fairy':
-        add_rule(world.get_location('Blacksmiths'), lambda state: state.has('Ocarina') and (state.has('Hookshot') or (state.has('Hammer') and state.has('Mirror'))))
-
-
 def set_big_bomb_rules(world):
     # this is a mess
     bombshop_entrance = world.get_region('Big Bomb Shop').entrances[0]