diff --git a/src/Dodge/Creature/ArmourChase.hs b/src/Dodge/Creature/ArmourChase.hs
index aa637ce01..0ddb5d326 100644
--- a/src/Dodge/Creature/ArmourChase.hs
+++ b/src/Dodge/Creature/ArmourChase.hs
@@ -3,8 +3,8 @@ module Dodge.Creature.ArmourChase (
     flockArmourChaseCrit,
 ) where
 
-import Dodge.Data.Equipment.Misc
-import Control.Lens
+--import Dodge.Data.Equipment.Misc
+--import Control.Lens
 import Dodge.Creature.ChaseCrit
 import Dodge.Data.Creature
 import Dodge.Default
@@ -43,4 +43,4 @@ armourChaseCrit =
 --                ]
 --        , _crMvType = defaultChaseMvType{_mvTurnRad = FloatConst 0.05}
         }
-        & crEquipment . at OnChest ?~ 0
+--        & crEquipment . at OnChest ?~ 0
diff --git a/src/Dodge/Inventory.hs b/src/Dodge/Inventory.hs
index 934c4a356..26c1ac15c 100644
--- a/src/Dodge/Inventory.hs
+++ b/src/Dodge/Inventory.hs
@@ -96,9 +96,7 @@ rmInvItem cid invid w =
     itm = w ^?! cWorld . lWorld . items . ix itid
     dounequipfunction = effectOnRemove itm cr
     removeAnySlotEquipment = fromMaybe id $ do
-        epos <-
-            w ^? cWorld . lWorld . creatures . ix cid . crInv . ix invid
-                >>= \k -> w ^? cWorld . lWorld . items . ix k
+        epos <- w ^? cWorld . lWorld . items . ix itid
                     . itLocation
                     . ilEquipSite
                     . _Just