diff --git a/src/Color.hs b/src/Color.hs
index 12b708914..979d74732 100644
--- a/src/Color.hs
+++ b/src/Color.hs
@@ -1,18 +1,15 @@
-{-# LANGUAGE DeriveGeneric #-}
+--{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
-{-# LANGUAGE TemplateHaskell #-}
+--{-# LANGUAGE TemplateHaskell #-}
 
 module Color where
 
 import Flat
 import Data.Aeson
-import Data.Store
-import GHC.Generics
 import Geometry
-import LinearHelp
-import TH.Derive
+import LinearHelp ()
 
 data PaletteColor
     = RED
diff --git a/src/Dodge/CullBox.hs b/src/Dodge/CullBox.hs
index a47b73ab5..e7e8b416f 100644
--- a/src/Dodge/CullBox.hs
+++ b/src/Dodge/CullBox.hs
@@ -12,7 +12,7 @@ import Geometry
 findBoundDists :: Configuration -> World -> (Float, Float, Float, Float)
 findBoundDists cfig w
     | debugOn Bound_box_screen cfig = (hh, - hh, hw, - hw)
-    | otherwise = fromMaybe (0, 0, 0, 0) $ farWallDistDirection ((w ^. cWorld . cwCam . cwcCenter)) w
+    | otherwise = fromMaybe (0, 0, 0, 0) $ farWallDistDirection (w ^. cWorld . cwCam . cwcCenter) w
   where
     hw = halfWidth cfig
     hh = halfHeight cfig
diff --git a/src/Dodge/Data/ActionPlan.hs b/src/Dodge/Data/ActionPlan.hs
index 74cc03e9c..483ea8294 100644
--- a/src/Dodge/Data/ActionPlan.hs
+++ b/src/Dodge/Data/ActionPlan.hs
@@ -13,8 +13,6 @@ import Dodge.Data.Creature.Stance
 import Dodge.Data.CreatureEffect
 import Geometry.Data
 import Sound.Data
-import TH.Derive
-import Data.Store
 
 data ActionPlan
     = Inanimate
diff --git a/src/Dodge/Data/ArcStep.hs b/src/Dodge/Data/ArcStep.hs
index d3e116790..abb9bb8a5 100644
--- a/src/Dodge/Data/ArcStep.hs
+++ b/src/Dodge/Data/ArcStep.hs
@@ -11,9 +11,7 @@ import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.CrWlID
 import Geometry.Data
-import TH.Derive
-import Data.Store
-import LinearHelp
+import LinearHelp ()
 
 data ArcStep = ArcStep
     { _asPos :: Point2
diff --git a/src/Dodge/Data/Beam.hs b/src/Dodge/Data/Beam.hs
index 13d850a4f..2a43b8601 100644
--- a/src/Dodge/Data/Beam.hs
+++ b/src/Dodge/Data/Beam.hs
@@ -11,8 +11,6 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 {- | Linear beams. Last only one frame.
  - Can interact with one another in a limited manner
diff --git a/src/Dodge/Data/Block.hs b/src/Dodge/Data/Block.hs
index 517189b8b..8055382e0 100644
--- a/src/Dodge/Data/Block.hs
+++ b/src/Dodge/Data/Block.hs
@@ -10,7 +10,7 @@ module Dodge.Data.Block (
 ) where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Color
 import Control.Lens
 import Data.Aeson
@@ -20,8 +20,6 @@ import Dodge.Data.Material
 import Dodge.Data.PathGraph
 import Geometry
 import Shape.Data
-import TH.Derive
-import Data.Store
 
 data Block = Block
     { _blID :: Int
diff --git a/src/Dodge/Data/Bounds.hs b/src/Dodge/Data/Bounds.hs
index 5a1680808..ecbd1c3f8 100644
--- a/src/Dodge/Data/Bounds.hs
+++ b/src/Dodge/Data/Bounds.hs
@@ -9,8 +9,6 @@ import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import TH.Derive
-import Data.Store
 
 data Bounds = Bounds
     { _bdMinX :: Float
diff --git a/src/Dodge/Data/Bullet.hs b/src/Dodge/Data/Bullet.hs
index f21416d33..454c1ab14 100644
--- a/src/Dodge/Data/Bullet.hs
+++ b/src/Dodge/Data/Bullet.hs
@@ -9,14 +9,12 @@ module Dodge.Data.Bullet
     )where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Damage
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data Bullet = Bullet
     { _buDelayFraction :: Float
diff --git a/src/Dodge/Data/Button.hs b/src/Dodge/Data/Button.hs
index 536aa59a4..65d3a832a 100644
--- a/src/Dodge/Data/Button.hs
+++ b/src/Dodge/Data/Button.hs
@@ -6,7 +6,7 @@
 module Dodge.Data.Button where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Color
 import Control.Lens
 import Data.Aeson
@@ -14,8 +14,6 @@ import Data.Aeson.TH
 import Dodge.Data.WorldEffect
 import Geometry.Data
 import Sound.Data
-import TH.Derive
-import Data.Store
 
 data ButtonDraw
     = DefaultDrawButton Color
diff --git a/src/Dodge/Data/CamouflageStatus.hs b/src/Dodge/Data/CamouflageStatus.hs
index 70be1500f..dfa4d93a3 100644
--- a/src/Dodge/Data/CamouflageStatus.hs
+++ b/src/Dodge/Data/CamouflageStatus.hs
@@ -8,8 +8,6 @@ module Dodge.Data.CamouflageStatus where
 import Flat
 import Data.Aeson
 import Data.Aeson.TH
-import TH.Derive
-import Data.Store
 
 data CamouflageStatus
     = FullyVisible
diff --git a/src/Dodge/Data/Cloud.hs b/src/Dodge/Data/Cloud.hs
index ec203f65e..8c308c826 100644
--- a/src/Dodge/Data/Cloud.hs
+++ b/src/Dodge/Data/Cloud.hs
@@ -11,8 +11,6 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry
-import TH.Derive
-import Data.Store
 
 data CloudDraw
     = CloudColor Float Float Color -- radius-multiply fade-time color
diff --git a/src/Dodge/Data/CrGroupParams.hs b/src/Dodge/Data/CrGroupParams.hs
index 013399494..dfb37618f 100644
--- a/src/Dodge/Data/CrGroupParams.hs
+++ b/src/Dodge/Data/CrGroupParams.hs
@@ -12,8 +12,6 @@ import Data.Aeson
 import Data.Aeson.TH
 import qualified IntSetHelp as IS
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data CrGroupParams = CrGroupParams
     { _crGroupParamID :: Int
diff --git a/src/Dodge/Data/Creature.hs b/src/Dodge/Data/Creature.hs
index 9ee68663f..68c87016a 100644
--- a/src/Dodge/Data/Creature.hs
+++ b/src/Dodge/Data/Creature.hs
@@ -18,9 +18,7 @@ module Dodge.Data.Creature (
 ) where
 
 import Flat
-import LinearHelp
-import TH.Derive
-import Data.Store
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
diff --git a/src/Dodge/Data/Creature/Memory.hs b/src/Dodge/Data/Creature/Memory.hs
index 29741a39a..7d247f28c 100644
--- a/src/Dodge/Data/Creature/Memory.hs
+++ b/src/Dodge/Data/Creature/Memory.hs
@@ -6,13 +6,11 @@
 module Dodge.Data.Creature.Memory where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data Memory = Memory
     { _soundsToInvestigate :: [Point2]
diff --git a/src/Dodge/Data/Creature/Misc.hs b/src/Dodge/Data/Creature/Misc.hs
index 58a6e0812..b1fc31bc2 100644
--- a/src/Dodge/Data/Creature/Misc.hs
+++ b/src/Dodge/Data/Creature/Misc.hs
@@ -9,8 +9,6 @@ module Dodge.Data.Creature.Misc (
 ) where
 
 import Flat
-import TH.Derive
-import Data.Store
 import Color
 import Control.Lens
 import Data.Aeson
diff --git a/src/Dodge/Data/Creature/Perception.hs b/src/Dodge/Data/Creature/Perception.hs
index a0f5d638a..5ac558d64 100644
--- a/src/Dodge/Data/Creature/Perception.hs
+++ b/src/Dodge/Data/Creature/Perception.hs
@@ -29,8 +29,6 @@ import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.FloatFunction
 import qualified IntMapHelp as IM
-import TH.Derive
-import Data.Store
 
 data Perception = Perception
     { _cpVigilance :: Vigilance
diff --git a/src/Dodge/Data/Creature/Stance.hs b/src/Dodge/Data/Creature/Stance.hs
index cc5429212..d152a85af 100644
--- a/src/Dodge/Data/Creature/Stance.hs
+++ b/src/Dodge/Data/Creature/Stance.hs
@@ -6,13 +6,11 @@
 module Dodge.Data.Creature.Stance where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data Stance = Stance
     { _carriage :: Carriage
diff --git a/src/Dodge/Data/Creature/State.hs b/src/Dodge/Data/Creature/State.hs
index 64ecc8ca4..4f5bc1a77 100644
--- a/src/Dodge/Data/Creature/State.hs
+++ b/src/Dodge/Data/Creature/State.hs
@@ -13,8 +13,6 @@ import Data.Aeson.TH
 import qualified IntSetHelp as IS
 import Dodge.Data.Damage
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data CreatureState = CrSt
     { _csDamage :: [Damage]
diff --git a/src/Dodge/Data/Damage.hs b/src/Dodge/Data/Damage.hs
index 7cdaf893a..f37013032 100644
--- a/src/Dodge/Data/Damage.hs
+++ b/src/Dodge/Data/Damage.hs
@@ -13,10 +13,8 @@ module Dodge.Data.Damage (
 ) where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
-import TH.Derive
-import Data.Store
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Damage.Type
diff --git a/src/Dodge/Data/Damage/Type.hs b/src/Dodge/Data/Damage/Type.hs
index 56d27331e..ec4b0ef71 100644
--- a/src/Dodge/Data/Damage/Type.hs
+++ b/src/Dodge/Data/Damage/Type.hs
@@ -8,8 +8,6 @@ module Dodge.Data.Damage.Type where
 import Flat
 import Data.Aeson
 import Data.Aeson.TH
-import TH.Derive
-import Data.Store
 
 data DamageType
     = PIERCING
diff --git a/src/Dodge/Data/Distortion.hs b/src/Dodge/Data/Distortion.hs
index 05d11d770..2d97e5327 100644
--- a/src/Dodge/Data/Distortion.hs
+++ b/src/Dodge/Data/Distortion.hs
@@ -7,11 +7,9 @@ module Dodge.Data.Distortion where
 
 import Data.Aeson
 import Data.Aeson.TH
-import Data.Store
 import Flat
 import Geometry
-import LinearHelp
-import TH.Derive
+import LinearHelp ()
 
 data Distortion
     = RadialDistortion Point2 Point2 Point2 Float
diff --git a/src/Dodge/Data/Door.hs b/src/Dodge/Data/Door.hs
index ba1366cd9..f9b74f940 100644
--- a/src/Dodge/Data/Door.hs
+++ b/src/Dodge/Data/Door.hs
@@ -11,7 +11,7 @@ module Dodge.Data.Door (
 ) where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -20,8 +20,6 @@ import Dodge.Data.MountedObject
 import Dodge.Data.PathGraph
 import Dodge.Data.WorldEffect
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data DoorStatus = DoorOpen | DoorClosed | DoorHalfway | DoorInt Int
     deriving (Eq, Ord, Show, Read, Generic, Flat)
diff --git a/src/Dodge/Data/EnergyBall.hs b/src/Dodge/Data/EnergyBall.hs
index d6f5f9ff4..e1fc3e94e 100644
--- a/src/Dodge/Data/EnergyBall.hs
+++ b/src/Dodge/Data/EnergyBall.hs
@@ -12,8 +12,6 @@ import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Damage.Type
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data EnergyBall = EnergyBall
     { _ebVel :: Point2
diff --git a/src/Dodge/Data/Equipment/Misc.hs b/src/Dodge/Data/Equipment/Misc.hs
index 3aa5af05a..b4c826fcb 100644
--- a/src/Dodge/Data/Equipment/Misc.hs
+++ b/src/Dodge/Data/Equipment/Misc.hs
@@ -8,8 +8,6 @@ module Dodge.Data.Equipment.Misc where
 import Flat
 import Data.Aeson
 import Data.Aeson.TH
-import TH.Derive
-import Data.Store
 
 data EquipSite
     = GoesOnHead
diff --git a/src/Dodge/Data/Flame.hs b/src/Dodge/Data/Flame.hs
index c03159345..b00a2a926 100644
--- a/src/Dodge/Data/Flame.hs
+++ b/src/Dodge/Data/Flame.hs
@@ -11,8 +11,6 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data Flame = Flame
     { _flVel :: Point2
diff --git a/src/Dodge/Data/Flare.hs b/src/Dodge/Data/Flare.hs
index 170478cbc..8a90a92d9 100644
--- a/src/Dodge/Data/Flare.hs
+++ b/src/Dodge/Data/Flare.hs
@@ -6,14 +6,12 @@
 module Dodge.Data.Flare where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry
-import TH.Derive
-import Data.Store
 
 data Flare
     = MuzFlare
diff --git a/src/Dodge/Data/FloatFunction.hs b/src/Dodge/Data/FloatFunction.hs
index 60f14079c..1b317f1bd 100644
--- a/src/Dodge/Data/FloatFunction.hs
+++ b/src/Dodge/Data/FloatFunction.hs
@@ -6,8 +6,6 @@
 module Dodge.Data.FloatFunction where
 
 import Flat
-import TH.Derive
-import Data.Store
 import Data.Aeson
 import Data.Aeson.TH
 
diff --git a/src/Dodge/Data/FloorItem.hs b/src/Dodge/Data/FloorItem.hs
index 490d61f75..58e60e34f 100644
--- a/src/Dodge/Data/FloorItem.hs
+++ b/src/Dodge/Data/FloorItem.hs
@@ -6,14 +6,12 @@
 module Dodge.Data.FloorItem where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Item
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data FloorItem = FlIt {_flIt :: Item, _flItPos :: Point2, _flItRot :: Float, _flItID :: Int}
     deriving (Eq, Show, Read, Generic, Flat)
diff --git a/src/Dodge/Data/ForegroundShape.hs b/src/Dodge/Data/ForegroundShape.hs
index 3dcbbf2b4..80057e690 100644
--- a/src/Dodge/Data/ForegroundShape.hs
+++ b/src/Dodge/Data/ForegroundShape.hs
@@ -6,14 +6,12 @@
 module Dodge.Data.ForegroundShape where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry
 import ShapePicture
-import TH.Derive
-import Data.Store
 
 data ForegroundShape = ForegroundShape
     { _fsID :: Int
diff --git a/src/Dodge/Data/GenParams.hs b/src/Dodge/Data/GenParams.hs
index 52fda0940..8eaefac73 100644
--- a/src/Dodge/Data/GenParams.hs
+++ b/src/Dodge/Data/GenParams.hs
@@ -12,8 +12,6 @@ import Data.Aeson
 import Data.Aeson.TH
 import qualified Data.Map.Strict as M
 import Dodge.Data.Damage.Type
-import TH.Derive
-import Data.Store
 
 newtype GenParams = GenParams
     { _sensorCoding :: M.Map DamageType (PaletteColor, DecorationShape)
diff --git a/src/Dodge/Data/Gust.hs b/src/Dodge/Data/Gust.hs
index 2cbb04761..842cbafef 100644
--- a/src/Dodge/Data/Gust.hs
+++ b/src/Dodge/Data/Gust.hs
@@ -6,13 +6,11 @@
 module Dodge.Data.Gust where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data Gust = Gust
     { _guID :: Int
diff --git a/src/Dodge/Data/HUD.hs b/src/Dodge/Data/HUD.hs
index c2277c058..88069736a 100644
--- a/src/Dodge/Data/HUD.hs
+++ b/src/Dodge/Data/HUD.hs
@@ -6,13 +6,11 @@
 module Dodge.Data.HUD where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data HUDElement
     = DisplayInventory {_subInventory :: SubInventory}
diff --git a/src/Dodge/Data/Hammer.hs b/src/Dodge/Data/Hammer.hs
index dbdd1e20a..b00fa4206 100644
--- a/src/Dodge/Data/Hammer.hs
+++ b/src/Dodge/Data/Hammer.hs
@@ -9,8 +9,6 @@ import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import TH.Derive
-import Data.Store
 
 data HammerType
     = NoHammer
diff --git a/src/Dodge/Data/Item.hs b/src/Dodge/Data/Item.hs
index fbd599695..6fdae4cfa 100644
--- a/src/Dodge/Data/Item.hs
+++ b/src/Dodge/Data/Item.hs
@@ -18,8 +18,6 @@ module Dodge.Data.Item (
 ) where
 
 import Flat
-import Data.Store
-import TH.Derive
 import Color
 import Control.Lens
 import Data.Aeson
diff --git a/src/Dodge/Data/Item/Combine.hs b/src/Dodge/Data/Item/Combine.hs
index 96d5b8393..f291303a4 100644
--- a/src/Dodge/Data/Item/Combine.hs
+++ b/src/Dodge/Data/Item/Combine.hs
@@ -7,8 +7,6 @@ module Dodge.Data.Item.Combine where
 
 import Flat
 import Control.Lens
-import TH.Derive
-import Data.Store
 import Data.Aeson
 import Data.Aeson.TH
 import qualified Data.Map.Strict as M
diff --git a/src/Dodge/Data/Item/CurseStatus.hs b/src/Dodge/Data/Item/CurseStatus.hs
index d9715b30b..ff7d73f13 100644
--- a/src/Dodge/Data/Item/CurseStatus.hs
+++ b/src/Dodge/Data/Item/CurseStatus.hs
@@ -8,8 +8,6 @@ module Dodge.Data.Item.CurseStatus where
 import Flat
 import Data.Aeson
 import Data.Aeson.TH
-import TH.Derive
-import Data.Store
 
 data CurseStatus
     = Uncursed
diff --git a/src/Dodge/Data/Item/Effect.hs b/src/Dodge/Data/Item/Effect.hs
index 1aed3c60f..538185db5 100644
--- a/src/Dodge/Data/Item/Effect.hs
+++ b/src/Dodge/Data/Item/Effect.hs
@@ -9,8 +9,6 @@ import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import TH.Derive
-import Data.Store
 
 data ItEffect = ItEffect
     { _ieInv :: ItInvEffect --Item -> Creature -> World -> World
@@ -32,11 +30,9 @@ data ItInvEffect
     deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data ItFloorEffect = NoFloorEffect
-    | DefaultFloorEffect
     deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 data ItDropEffect = NoDropEffect
-    | DefaultDropEffect
     deriving (Eq, Ord, Show, Read, Generic, Flat)
 
 makeLenses ''ItEffect
diff --git a/src/Dodge/Data/Item/HeldDelay.hs b/src/Dodge/Data/Item/HeldDelay.hs
index f046affb3..64c9a9dec 100644
--- a/src/Dodge/Data/Item/HeldDelay.hs
+++ b/src/Dodge/Data/Item/HeldDelay.hs
@@ -9,8 +9,6 @@ import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import TH.Derive
-import Data.Store
 
 data UseDelay -- should just be Delay
     = NoDelay
diff --git a/src/Dodge/Data/Item/HeldScroll.hs b/src/Dodge/Data/Item/HeldScroll.hs
index b035d9163..8e7163e91 100644
--- a/src/Dodge/Data/Item/HeldScroll.hs
+++ b/src/Dodge/Data/Item/HeldScroll.hs
@@ -10,8 +10,6 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import qualified Data.Sequence as Seq
-import TH.Derive
-import Data.Store
 
 data HeldScroll
     = HeldScrollDoNothing
diff --git a/src/Dodge/Data/Item/HeldUse.hs b/src/Dodge/Data/Item/HeldUse.hs
index 6bc170459..22159d29d 100644
--- a/src/Dodge/Data/Item/HeldUse.hs
+++ b/src/Dodge/Data/Item/HeldUse.hs
@@ -10,8 +10,6 @@ import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.CamouflageStatus
 import Dodge.Data.Item.Combine
-import TH.Derive
-import Data.Store
 
 data HeldUse
     = HeldDoNothing
diff --git a/src/Dodge/Data/Item/Location.hs b/src/Dodge/Data/Item/Location.hs
index 8b2f7d012..8058b0e3e 100644
--- a/src/Dodge/Data/Item/Location.hs
+++ b/src/Dodge/Data/Item/Location.hs
@@ -8,8 +8,6 @@ import Flat
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
-import TH.Derive
-import Data.Store
 
 data ItemLocation
     = InInv {_ipCrID :: Int, _ipInvID :: Int}
diff --git a/src/Dodge/Data/Item/Misc.hs b/src/Dodge/Data/Item/Misc.hs
index 14f4acb94..ae3033b63 100644
--- a/src/Dodge/Data/Item/Misc.hs
+++ b/src/Dodge/Data/Item/Misc.hs
@@ -10,9 +10,7 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
-import LinearHelp
+import LinearHelp ()
 
 data ItemDimension = ItemDimension
     { _dimRad :: Float
diff --git a/src/Dodge/Data/Item/Params.hs b/src/Dodge/Data/Item/Params.hs
index 2972227b3..9aa446223 100644
--- a/src/Dodge/Data/Item/Params.hs
+++ b/src/Dodge/Data/Item/Params.hs
@@ -13,8 +13,6 @@ import Data.Aeson.TH
 import Dodge.Data.ArcStep
 import Dodge.Data.Beam
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data ItemParams
     = NoParams
diff --git a/src/Dodge/Data/Item/Scope.hs b/src/Dodge/Data/Item/Scope.hs
index bbaaf69dd..944b61f31 100644
--- a/src/Dodge/Data/Item/Scope.hs
+++ b/src/Dodge/Data/Item/Scope.hs
@@ -10,9 +10,7 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
-import LinearHelp
+import LinearHelp ()
 
 data Scope
     = NoScope
diff --git a/src/Dodge/Data/Item/Targeting.hs b/src/Dodge/Data/Item/Targeting.hs
index 323e7a091..d0a8a6ec7 100644
--- a/src/Dodge/Data/Item/Targeting.hs
+++ b/src/Dodge/Data/Item/Targeting.hs
@@ -10,9 +10,7 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
-import LinearHelp
+import LinearHelp ()
 
 data Targeting
     = NoTargeting
diff --git a/src/Dodge/Data/Item/Tweak.hs b/src/Dodge/Data/Item/Tweak.hs
index c5e8cc33f..1fedca93f 100644
--- a/src/Dodge/Data/Item/Tweak.hs
+++ b/src/Dodge/Data/Item/Tweak.hs
@@ -10,8 +10,6 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import qualified IntMapHelp as IM
-import TH.Derive
-import Data.Store
 
 data ItemTweaks
     = NoTweaks
diff --git a/src/Dodge/Data/Item/Use.hs b/src/Dodge/Data/Item/Use.hs
index a1de7f7bd..3fa9a6083 100644
--- a/src/Dodge/Data/Item/Use.hs
+++ b/src/Dodge/Data/Item/Use.hs
@@ -23,8 +23,6 @@ import Dodge.Data.Item.HeldUse
 import Dodge.Data.Item.Use.Consumption
 import Dodge.Data.Item.Use.Equipment
 import Dodge.Data.Item.HeldDelay
-import TH.Derive
-import Data.Store
 
 data ItemUse
     = HeldUse
diff --git a/src/Dodge/Data/Item/Use/Consumption.hs b/src/Dodge/Data/Item/Use/Consumption.hs
index 857a16705..fb5548b7b 100644
--- a/src/Dodge/Data/Item/Use/Consumption.hs
+++ b/src/Dodge/Data/Item/Use/Consumption.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -11,8 +12,6 @@ module Dodge.Data.Item.Use.Consumption (
 ) where
 
 import Flat
-import TH.Derive
-import Data.Store
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
@@ -45,7 +44,10 @@ data LeftConsumption
     deriving (Eq, Show, Read, Generic, Flat)
 
 newtype ItAmount = ItAmount {_getItAmount :: Int}
-    deriving (Eq, Ord, Read, Show, Num, Real, Enum, Integral, Generic, Flat)
+--    deriving (Eq, Ord, Read, Show, Num, Real, Generic, Flat)
+    deriving newtype (Eq, Ord, Read, Show, Num, Real, Enum, Integral)
+    deriving stock (Generic)
+    deriving anyclass (Flat)
 
 makeLenses ''HeldConsumption
 makeLenses ''LeftConsumption
diff --git a/src/Dodge/Data/Item/Use/Consumption/Ammo.hs b/src/Dodge/Data/Item/Use/Consumption/Ammo.hs
index c8e3cb86f..639c1d4db 100644
--- a/src/Dodge/Data/Item/Use/Consumption/Ammo.hs
+++ b/src/Dodge/Data/Item/Use/Consumption/Ammo.hs
@@ -10,8 +10,6 @@ module Dodge.Data.Item.Use.Consumption.Ammo (
 ) where
 
 import Flat
-import TH.Derive
-import Data.Store
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
diff --git a/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs b/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs
index 9b2ac473e..9ea65e509 100644
--- a/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs
+++ b/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs
@@ -11,8 +11,6 @@ import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Hammer
 import Sound.Data
-import TH.Derive
-import Data.Store
 
 data LoadAction
     = LoadEject {_actionTime :: Int, _actionSound :: SoundID}
diff --git a/src/Dodge/Data/Item/Use/Equipment.hs b/src/Dodge/Data/Item/Use/Equipment.hs
index 99b22d257..489589008 100644
--- a/src/Dodge/Data/Item/Use/Equipment.hs
+++ b/src/Dodge/Data/Item/Use/Equipment.hs
@@ -14,8 +14,6 @@ import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Equipment.Misc
 import Dodge.Data.Item.HeldUse
-import TH.Derive
-import Data.Store
 
 data EquipEffect = EquipEffect
     { _eeUse :: Euse --Item -> Creature -> World -> World
diff --git a/src/Dodge/Data/Laser.hs b/src/Dodge/Data/Laser.hs
index 19bd7e539..04294ef4a 100644
--- a/src/Dodge/Data/Laser.hs
+++ b/src/Dodge/Data/Laser.hs
@@ -11,8 +11,6 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data LaserType
     = DamageLaser {_laserTypeDamage :: Int}
diff --git a/src/Dodge/Data/LightSource.hs b/src/Dodge/Data/LightSource.hs
index 20f842aad..220b0e624 100644
--- a/src/Dodge/Data/LightSource.hs
+++ b/src/Dodge/Data/LightSource.hs
@@ -6,13 +6,11 @@
 module Dodge.Data.LightSource where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry
-import TH.Derive
-import Data.Store
 
 data LightSourceDraw = DefaultLightSourceDraw
     deriving (Eq, Ord, Show, Read, Generic, Flat)
diff --git a/src/Dodge/Data/LinearShockwave.hs b/src/Dodge/Data/LinearShockwave.hs
index 97dd968ad..7f9420be8 100644
--- a/src/Dodge/Data/LinearShockwave.hs
+++ b/src/Dodge/Data/LinearShockwave.hs
@@ -6,13 +6,11 @@
 module Dodge.Data.LinearShockwave where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data LinearShockwave = LinearShockwave
     { _lwPos :: Point2
diff --git a/src/Dodge/Data/Machine.hs b/src/Dodge/Data/Machine.hs
index 931143b3d..38efcffe4 100644
--- a/src/Dodge/Data/Machine.hs
+++ b/src/Dodge/Data/Machine.hs
@@ -14,7 +14,7 @@ module Dodge.Data.Machine (
 ) where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Color
 import Control.Lens
 import Data.Aeson
@@ -29,8 +29,6 @@ import Dodge.Data.Material
 import Dodge.Data.ObjectType
 import Geometry.Data
 import Sound.Data
-import TH.Derive
-import Data.Store
 
 data Machine = Machine
     { _mcID :: Int
diff --git a/src/Dodge/Data/Machine/Sensor.hs b/src/Dodge/Data/Machine/Sensor.hs
index 713efdcf1..768966a87 100644
--- a/src/Dodge/Data/Machine/Sensor.hs
+++ b/src/Dodge/Data/Machine/Sensor.hs
@@ -6,7 +6,7 @@
 module Dodge.Data.Machine.Sensor where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Dodge.Data.GenParams
 import Color
 import Control.Lens
@@ -14,8 +14,6 @@ import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Item.Combine
 import Dodge.Data.Damage.Type
-import TH.Derive
-import Data.Store
 
 data Sensor
     = DamageSensor
diff --git a/src/Dodge/Data/Magnet.hs b/src/Dodge/Data/Magnet.hs
index 0655cde8b..5818c4547 100644
--- a/src/Dodge/Data/Magnet.hs
+++ b/src/Dodge/Data/Magnet.hs
@@ -6,13 +6,11 @@
 module Dodge.Data.Magnet where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 newtype MagnetUpdate = MagnetUpdateTimer Int
     deriving (Eq, Ord, Show, Read, Generic, Flat)
diff --git a/src/Dodge/Data/Material.hs b/src/Dodge/Data/Material.hs
index f9df71e9e..3a0664696 100644
--- a/src/Dodge/Data/Material.hs
+++ b/src/Dodge/Data/Material.hs
@@ -8,8 +8,6 @@ module Dodge.Data.Material where
 import Flat
 import Data.Aeson
 import Data.Aeson.TH
-import TH.Derive
-import Data.Store
 
 data Material = Wood | Dirt | Stone | Glass | Metal | Crystal | Flesh | Electronics
     deriving (Eq, Ord, Show, Bounded, Enum, Read, Generic, Flat)
diff --git a/src/Dodge/Data/Modification.hs b/src/Dodge/Data/Modification.hs
index 9da83f6e7..046f863f3 100644
--- a/src/Dodge/Data/Modification.hs
+++ b/src/Dodge/Data/Modification.hs
@@ -6,14 +6,12 @@
 module Dodge.Data.Modification where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.WorldEffect
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data Modification
     = ModIDTimerPoint3Bool
diff --git a/src/Dodge/Data/MountedObject.hs b/src/Dodge/Data/MountedObject.hs
index 4ba5974fa..0d19ad8dd 100644
--- a/src/Dodge/Data/MountedObject.hs
+++ b/src/Dodge/Data/MountedObject.hs
@@ -8,8 +8,6 @@ module Dodge.Data.MountedObject where
 import Flat
 import Data.Aeson
 import Data.Aeson.TH
-import TH.Derive
-import Data.Store
 
 data MountedObject
     = MountedLS Int
diff --git a/src/Dodge/Data/PathGraph.hs b/src/Dodge/Data/PathGraph.hs
index 55b850b19..de5160cfc 100644
--- a/src/Dodge/Data/PathGraph.hs
+++ b/src/Dodge/Data/PathGraph.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE DeriveGeneric #-}
+--{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -15,17 +15,13 @@ The warnings have been disabled.
 module Dodge.Data.PathGraph where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Graph.Inductive
 import Data.Map.Strict (Map)
 import qualified Data.Set as Set
-import Data.Store
-import Data.Store.TH
-import GHC.Generics
 import Geometry.Data
-import TH.Derive
 
 data PathGraph = PathGraph
     { _pgGraph :: Gr Point2 PathEdge
diff --git a/src/Dodge/Data/Payload.hs b/src/Dodge/Data/Payload.hs
index aabf8fe66..3fe9b1d3a 100644
--- a/src/Dodge/Data/Payload.hs
+++ b/src/Dodge/Data/Payload.hs
@@ -8,8 +8,6 @@ module Dodge.Data.Payload where
 import Flat
 import Data.Aeson
 import Data.Aeson.TH
-import TH.Derive
-import Data.Store
 
 data Payload = ExplosionPayload | DudPayload
     deriving (Show, Read, Eq, Ord, Enum, Bounded, Generic, Flat)
diff --git a/src/Dodge/Data/PosEvent.hs b/src/Dodge/Data/PosEvent.hs
index f8d92e127..236374fbc 100644
--- a/src/Dodge/Data/PosEvent.hs
+++ b/src/Dodge/Data/PosEvent.hs
@@ -11,8 +11,6 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data PosEventType = SparkSpawner
     deriving (Eq, Ord, Show, Read, Generic, Flat)
diff --git a/src/Dodge/Data/PressPlate.hs b/src/Dodge/Data/PressPlate.hs
index 3961e3676..48c1ce7c6 100644
--- a/src/Dodge/Data/PressPlate.hs
+++ b/src/Dodge/Data/PressPlate.hs
@@ -6,14 +6,12 @@
 module Dodge.Data.PressPlate where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
 import Picture
-import TH.Derive
-import Data.Store
 
 data PressPlateEvent
     = PressPlateId
diff --git a/src/Dodge/Data/Projectile.hs b/src/Dodge/Data/Projectile.hs
index 3e2bd3004..4ee8beb0d 100644
--- a/src/Dodge/Data/Projectile.hs
+++ b/src/Dodge/Data/Projectile.hs
@@ -12,8 +12,6 @@ import Data.Aeson.TH
 import Dodge.Data.Item.Use.Consumption.Ammo
 import Geometry.Data
 
-import TH.Derive
-import Data.Store
 data Proj
     = Shell
         { _prjPos :: Point2
diff --git a/src/Dodge/Data/Prop.hs b/src/Dodge/Data/Prop.hs
index 7bdf12329..b0f0378c3 100644
--- a/src/Dodge/Data/Prop.hs
+++ b/src/Dodge/Data/Prop.hs
@@ -15,8 +15,6 @@ import Geometry.Data
 import qualified Quaternion as Q
 import Shape.Data
 import ShapePicture.Data
-import TH.Derive
-import Data.Store
 
 data Prop
     = PropZ
diff --git a/src/Dodge/Data/RadarBlip.hs b/src/Dodge/Data/RadarBlip.hs
index c2c195d11..e39c03e76 100644
--- a/src/Dodge/Data/RadarBlip.hs
+++ b/src/Dodge/Data/RadarBlip.hs
@@ -6,14 +6,12 @@
 module Dodge.Data.RadarBlip where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry
-import TH.Derive
-import Data.Store
 
 data RadarBlip = RadarBlip
     { _rbColor :: Color
diff --git a/src/Dodge/Data/RadarSweep.hs b/src/Dodge/Data/RadarSweep.hs
index 0a52678dd..ae962e290 100644
--- a/src/Dodge/Data/RadarSweep.hs
+++ b/src/Dodge/Data/RadarSweep.hs
@@ -9,14 +9,12 @@ module Dodge.Data.RadarSweep (
 ) where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.ObjectType
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data RadarSweep = RadarSweep
     { _rsPos :: Point2
diff --git a/src/Dodge/Data/Shockwave.hs b/src/Dodge/Data/Shockwave.hs
index 2db985c28..e7e46da5a 100644
--- a/src/Dodge/Data/Shockwave.hs
+++ b/src/Dodge/Data/Shockwave.hs
@@ -11,8 +11,6 @@ import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data ShockwaveDirection = OutwardShockwave | InwardShockwave
     deriving (Eq, Ord, Show, Read, Generic, Flat)
diff --git a/src/Dodge/Data/SoundOrigin.hs b/src/Dodge/Data/SoundOrigin.hs
index fc418c22e..832c6e748 100644
--- a/src/Dodge/Data/SoundOrigin.hs
+++ b/src/Dodge/Data/SoundOrigin.hs
@@ -9,8 +9,6 @@ import Flat
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Material
-import TH.Derive
-import Data.Store
 
 data SoundOrigin
     = InventorySound
diff --git a/src/Dodge/Data/Spark.hs b/src/Dodge/Data/Spark.hs
index d107d4ec9..9eec8bbcf 100644
--- a/src/Dodge/Data/Spark.hs
+++ b/src/Dodge/Data/Spark.hs
@@ -6,15 +6,13 @@
 module Dodge.Data.Spark where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.Damage.Type
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data Spark = Spark
     { _skVel :: Point2
diff --git a/src/Dodge/Data/Terminal.hs b/src/Dodge/Data/Terminal.hs
index 7eb819a21..f2bcfb33d 100644
--- a/src/Dodge/Data/Terminal.hs
+++ b/src/Dodge/Data/Terminal.hs
@@ -6,7 +6,7 @@
 module Dodge.Data.Terminal where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Color
 import Control.Lens
 import Data.Aeson
@@ -14,8 +14,6 @@ import Data.Aeson.TH
 import qualified Data.Map.Strict as M
 import qualified Data.Text as T
 import Dodge.Data.WorldEffect
-import TH.Derive
-import Data.Store
 
 data TerminalStatus = TerminalOff | TerminalBusy | TerminalReady
     deriving (Eq, Ord, Show, Read, Generic, Flat)
diff --git a/src/Dodge/Data/TeslaArc.hs b/src/Dodge/Data/TeslaArc.hs
index 4159096b3..58f3c291c 100644
--- a/src/Dodge/Data/TeslaArc.hs
+++ b/src/Dodge/Data/TeslaArc.hs
@@ -6,15 +6,13 @@
 module Dodge.Data.TeslaArc where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Color
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Dodge.Data.ArcStep
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data TeslaArc = TeslaArc
     { _taPoints :: [Point2]
diff --git a/src/Dodge/Data/TractorBeam.hs b/src/Dodge/Data/TractorBeam.hs
index 906987a09..5df98014c 100644
--- a/src/Dodge/Data/TractorBeam.hs
+++ b/src/Dodge/Data/TractorBeam.hs
@@ -6,13 +6,11 @@
 module Dodge.Data.TractorBeam where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
-import TH.Derive
-import Data.Store
 
 data TractorBeam = TractorBeam
     { _tbPos :: Point2
diff --git a/src/Dodge/Data/WorldEffect.hs b/src/Dodge/Data/WorldEffect.hs
index 5ecbcc3ed..9f7e59f7f 100644
--- a/src/Dodge/Data/WorldEffect.hs
+++ b/src/Dodge/Data/WorldEffect.hs
@@ -13,8 +13,6 @@ import Dodge.Data.Item
 import Dodge.Data.SoundOrigin
 import Geometry.Data
 import Sound.Data
-import TH.Derive
-import Data.Store
 
 data ItCrWdWd
     = ItCrWdId
diff --git a/src/Dodge/GameRoom.hs b/src/Dodge/GameRoom.hs
index fef7cea2d..8703949c7 100644
--- a/src/Dodge/GameRoom.hs
+++ b/src/Dodge/GameRoom.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE DeriveGeneric #-}
+--{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
@@ -10,11 +10,8 @@ module Dodge.GameRoom where
 import Flat
 import Control.Lens
 import Data.Aeson
-import Data.Store
-import GHC.Generics
 import Geometry
-import LinearHelp
-import TH.Derive
+import LinearHelp ()
 
 data GameRoom = GameRoom
     { _grViewpoints :: [Point2]
diff --git a/src/Dodge/Update/Camera.hs b/src/Dodge/Update/Camera.hs
index 4dcb704b6..40a6eed6c 100644
--- a/src/Dodge/Update/Camera.hs
+++ b/src/Dodge/Update/Camera.hs
@@ -245,7 +245,7 @@ farWallDistDirection p w =
     boundPoints $
         S.map f vps
   where
-    f q = (rotateV (negate $ (w ^. cWorld . cwCam . cwcRot)) . (-.- p)) (foldl' findPoint q (wls q))
+    f q = (rotateV (negate (w ^. cWorld . cwCam . cwcRot)) . (-.- p)) (foldl' findPoint q (wls q))
     wls q = filter wlIsOpaque $ wlsNearSeg p q w
     findPoint q = fromMaybe q . uncurry (intersectSegSeg p q) . _wlLine
     vps = streamViewpoints p w
diff --git a/src/IntSetHelp.hs b/src/IntSetHelp.hs
index 8f7445999..d2a5ca218 100644
--- a/src/IntSetHelp.hs
+++ b/src/IntSetHelp.hs
@@ -1,9 +1,10 @@
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StandaloneDeriving #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module IntSetHelp (
-    module IntSetHelp,
+    --module IntSetHelp,
     module Data.IntSet,
 ) where
 
diff --git a/src/LinearHelp.hs b/src/LinearHelp.hs
index f651285ae..6bef74c74 100644
--- a/src/LinearHelp.hs
+++ b/src/LinearHelp.hs
@@ -1,6 +1,7 @@
-{-# LANGUAGE DeriveGeneric #-}
+--{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StandaloneDeriving #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 module LinearHelp where
 
 import Flat
diff --git a/src/MaybeHelp.hs b/src/MaybeHelp.hs
index d4a8fc2c7..a33d4d25f 100644
--- a/src/MaybeHelp.hs
+++ b/src/MaybeHelp.hs
@@ -8,10 +8,7 @@ module MaybeHelp where
 
 import Control.Lens
 import Data.Aeson
-import Data.Store
 import Flat
-import GHC.Generics
-import TH.Derive
 
 data Maybe' a = Just' {__Just' :: a} | Nothing'
     deriving (Eq, Ord, Show, Read, Generic, Flat)
diff --git a/src/Picture/Data.hs b/src/Picture/Data.hs
index 640087fb8..09d5229b7 100644
--- a/src/Picture/Data.hs
+++ b/src/Picture/Data.hs
@@ -6,14 +6,12 @@
 module Picture.Data where
 
 import Flat
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 import Geometry.Data
 import Streaming
-import TH.Derive
-import Data.Store
 
 data Verx = Verx
     { _vxPos :: !Point3
diff --git a/src/Quaternion.hs b/src/Quaternion.hs
index cc36a57ca..b4352f0a3 100644
--- a/src/Quaternion.hs
+++ b/src/Quaternion.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
+--{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StandaloneDeriving #-}
-{-# LANGUAGE TemplateHaskell #-}
+--{-# LANGUAGE TemplateHaskell #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 {- |
@@ -20,7 +20,7 @@ import Geometry.Data
 import Geometry.Vector3D
 import Linear.Quaternion
 import qualified Linear.Quaternion as Q
-import LinearHelp
+import LinearHelp ()
 
 instance ToJSON a => ToJSON (Q.Quaternion a) where
     toEncoding = genericToEncoding defaultOptions
diff --git a/src/Shape/Data.hs b/src/Shape/Data.hs
index 8b8dcf419..2a2726c0e 100644
--- a/src/Shape/Data.hs
+++ b/src/Shape/Data.hs
@@ -10,13 +10,10 @@ module Shape.Data where
 
 import Control.Lens
 import Data.Aeson
-import Data.Store
 import Flat
-import GHC.Generics
 import Geometry.Data
-import LinearHelp
+import LinearHelp ()
 import Streaming
-import TH.Derive
 
 type Shape' = Stream (Of ShapeObj) IO ()
 
@@ -40,7 +37,9 @@ instance ToJSON ShapeObj where
 instance FromJSON ShapeObj
 
 newtype ShapeType = TopPrism Int
-    deriving (Eq, Ord, Show, Read, Generic, Flat)
+    deriving newtype (Eq, Ord, Show, Read)
+    deriving stock Generic
+    deriving anyclass Flat
 
 instance ToJSON ShapeType where
     toEncoding = genericToEncoding defaultOptions
diff --git a/src/Sound/Data.hs b/src/Sound/Data.hs
index 7613d9801..320d54b36 100644
--- a/src/Sound/Data.hs
+++ b/src/Sound/Data.hs
@@ -6,9 +6,7 @@
 module Sound.Data where
 
 import Flat
-import TH.Derive
-import Data.Store
-import LinearHelp
+import LinearHelp ()
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH