diff --git a/src/Color/Data.hs b/src/Color/Data.hs
index 08e11796c..f80e688c2 100644
--- a/src/Color/Data.hs
+++ b/src/Color/Data.hs
@@ -1,7 +1,4 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
---{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module Color.Data where
diff --git a/src/Dodge/Creature/Memory.hs b/src/Dodge/Creature/Memory.hs
deleted file mode 100644
index 1454e7116..000000000
--- a/src/Dodge/Creature/Memory.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-module Dodge.Creature.Memory
-    where
diff --git a/src/Dodge/Data/ActionPlan.hs b/src/Dodge/Data/ActionPlan.hs
index df1e79cf3..4c771d5ff 100644
--- a/src/Dodge/Data/ActionPlan.hs
+++ b/src/Dodge/Data/ActionPlan.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/AimStance.hs b/src/Dodge/Data/AimStance.hs
index a43fcb723..a04845cca 100644
--- a/src/Dodge/Data/AimStance.hs
+++ b/src/Dodge/Data/AimStance.hs
@@ -1,9 +1,8 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module Dodge.Data.AimStance where
+
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
diff --git a/src/Dodge/Data/ArcStep.hs b/src/Dodge/Data/ArcStep.hs
index 71245233e..a6561e5a9 100644
--- a/src/Dodge/Data/ArcStep.hs
+++ b/src/Dodge/Data/ArcStep.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -18,10 +16,5 @@ data ArcStep = ArcStep
     }
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
---data NextArcStep
---    = DefaultArcStep
---    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 makeLenses ''ArcStep
 deriveJSON defaultOptions ''ArcStep
---deriveJSON defaultOptions ''NextArcStep
diff --git a/src/Dodge/Data/Beam.hs b/src/Dodge/Data/Beam.hs
index e840a0561..573dde5e1 100644
--- a/src/Dodge/Data/Beam.hs
+++ b/src/Dodge/Data/Beam.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/BlBl.hs b/src/Dodge/Data/BlBl.hs
index 5bbad0184..6fac25a43 100644
--- a/src/Dodge/Data/BlBl.hs
+++ b/src/Dodge/Data/BlBl.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Block.hs b/src/Dodge/Data/Block.hs
index eef202a32..6a10f8062 100644
--- a/src/Dodge/Data/Block.hs
+++ b/src/Dodge/Data/Block.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Bounds.hs b/src/Dodge/Data/Bounds.hs
index 90dd5bc8d..c52730a32 100644
--- a/src/Dodge/Data/Bounds.hs
+++ b/src/Dodge/Data/Bounds.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Bullet.hs b/src/Dodge/Data/Bullet.hs
index cb04660ab..74745957d 100644
--- a/src/Dodge/Data/Bullet.hs
+++ b/src/Dodge/Data/Bullet.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Button.hs b/src/Dodge/Data/Button.hs
index bb62cc09a..6a485b0a8 100644
--- a/src/Dodge/Data/Button.hs
+++ b/src/Dodge/Data/Button.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/CWorld.hs b/src/Dodge/Data/CWorld.hs
index eba07cf47..4660488b2 100644
--- a/src/Dodge/Data/CWorld.hs
+++ b/src/Dodge/Data/CWorld.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Camera.hs b/src/Dodge/Data/Camera.hs
index 4521b7183..792ea3d9d 100644
--- a/src/Dodge/Data/Camera.hs
+++ b/src/Dodge/Data/Camera.hs
@@ -1,7 +1,6 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
+
 module Dodge.Data.Camera where
 
 import Control.Lens
@@ -13,12 +12,12 @@ data CamInGameType
     = CamOnPlayer
     | CamOpticScope
     | CamRemoteScope
-  deriving (Eq,Show,Read,Enum,Bounded)
+    deriving (Eq, Show, Read, Enum, Bounded)
 
 data CamControl
-    = CamInGame { _cigType :: CamInGameType}
+    = CamInGame {_cigType :: CamInGameType}
     | CamFloat
-  deriving (Eq,Show,Read)
+    deriving (Eq, Show, Read)
 
 data Camera = Camera
     { _camCenter :: Point2
@@ -38,6 +37,7 @@ makeLenses ''CamInGameType
 concat
     <$> mapM
         (deriveJSON defaultOptions)
-        [''CamInGameType
-        ,''CamControl 
-        ,''Camera ]
+        [ ''CamInGameType
+        , ''CamControl
+        , ''Camera
+        ]
diff --git a/src/Dodge/Data/Cloud.hs b/src/Dodge/Data/Cloud.hs
index 54b93378a..d88ce796b 100644
--- a/src/Dodge/Data/Cloud.hs
+++ b/src/Dodge/Data/Cloud.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/CombAmount.hs b/src/Dodge/Data/CombAmount.hs
index a5fef5079..fa77f78a9 100644
--- a/src/Dodge/Data/CombAmount.hs
+++ b/src/Dodge/Data/CombAmount.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE StrictData #-}
diff --git a/src/Dodge/Data/CrGroupParams.hs b/src/Dodge/Data/CrGroupParams.hs
index cd9ec127a..f2a1082c5 100644
--- a/src/Dodge/Data/CrGroupParams.hs
+++ b/src/Dodge/Data/CrGroupParams.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/CrWlID.hs b/src/Dodge/Data/CrWlID.hs
index baed78b31..a3c9427b3 100644
--- a/src/Dodge/Data/CrWlID.hs
+++ b/src/Dodge/Data/CrWlID.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Creature.hs b/src/Dodge/Data/Creature.hs
index f61b5dde8..b6bb17cc4 100644
--- a/src/Dodge/Data/Creature.hs
+++ b/src/Dodge/Data/Creature.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
@@ -9,7 +7,6 @@ module Dodge.Data.Creature (
     module Dodge.Data.Creature.Misc,
     module Dodge.Data.Creature.State,
     module Dodge.Data.Creature.Perception,
-    module Dodge.Data.Creature.Memory,
     module Dodge.Data.Creature.Stance,
     module Dodge.Data.ActionPlan,
     module Dodge.Data.Item,
@@ -26,7 +23,6 @@ import Data.Aeson
 import Data.Aeson.TH
 import qualified Data.Map.Strict as M
 import Dodge.Data.ActionPlan
-import Dodge.Data.Creature.Memory
 import Dodge.Data.Creature.Misc
 import Dodge.Data.Creature.Perception
 import Dodge.Data.Creature.Stance
@@ -39,7 +35,6 @@ import Geometry.Data
 data Creature = Creature
     { _crPos :: Point3
     , _crOldPos :: Point3
---    , _crZ :: Float
     , _crZVel :: Float
     , _crDir :: Float
     , _crMvDir :: Float
@@ -60,13 +55,10 @@ data Creature = Creature
     , _crFaction :: Faction
     , _crGroup :: CrGroup
     , _crIntention :: Intention
---    , _crMvType :: CrMvType
     , _crName :: String
     , _crDeathTimer :: Int
     }
 
---deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 data CrHP
     = HP Int
     | CrIsCorpse SPic
@@ -80,12 +72,19 @@ data Intention = Intention
     }
     deriving (Show)
 
---deriving (Eq, Show, Read) --Generic, Flat)
+data Memory = Memory
+    { _soundsToInvestigate :: [Point2]
+    , _nodesSearched :: [Int]
+    }
+    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+
+makeLenses ''Memory
 
 makeLenses ''Creature
 makeLenses ''Intention
 makePrisms ''CrHP
 
+deriveJSON defaultOptions ''Memory
 concat
     <$> mapM
         (deriveJSON defaultOptions)
diff --git a/src/Dodge/Data/Creature/Memory.hs b/src/Dodge/Data/Creature/Memory.hs
deleted file mode 100644
index a7089d4e9..000000000
--- a/src/Dodge/Data/Creature/Memory.hs
+++ /dev/null
@@ -1,20 +0,0 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE StrictData #-}
-{-# LANGUAGE TemplateHaskell #-}
-
-module Dodge.Data.Creature.Memory where
-
-import Control.Lens
-import Data.Aeson
-import Data.Aeson.TH
-import Geometry.Data
-
-data Memory = Memory
-    { _soundsToInvestigate :: [Point2]
-    , _nodesSearched :: [Int]
-    }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-makeLenses ''Memory
-deriveJSON defaultOptions ''Memory
diff --git a/src/Dodge/Data/Creature/Misc.hs b/src/Dodge/Data/Creature/Misc.hs
index cbcafbd4d..3292e7f98 100644
--- a/src/Dodge/Data/Creature/Misc.hs
+++ b/src/Dodge/Data/Creature/Misc.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Creature/Perception.hs b/src/Dodge/Data/Creature/Perception.hs
index 8174b10cf..485948a5d 100644
--- a/src/Dodge/Data/Creature/Perception.hs
+++ b/src/Dodge/Data/Creature/Perception.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Creature/Stance.hs b/src/Dodge/Data/Creature/Stance.hs
index 8e02be9d9..a1894570e 100644
--- a/src/Dodge/Data/Creature/Stance.hs
+++ b/src/Dodge/Data/Creature/Stance.hs
@@ -1,17 +1,15 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
-module Dodge.Data.Creature.Stance 
-    ( module Dodge.Data.Creature.Stance
-    , module Dodge.Data.AimStance
-    )where
+module Dodge.Data.Creature.Stance (
+    module Dodge.Data.Creature.Stance,
+    module Dodge.Data.AimStance,
+) where
 
-import Dodge.Data.AimStance
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
+import Dodge.Data.AimStance
 import Geometry.Data
 
 data Stance = Stance
@@ -22,7 +20,7 @@ data Stance = Stance
     deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Carriage
-    = Walking { _strideAmount :: Float , _currentFoot :: FootForward }
+    = Walking {_strideAmount :: Float, _currentFoot :: FootForward}
     | Standing
     | Floating
     | Flying
diff --git a/src/Dodge/Data/Creature/State.hs b/src/Dodge/Data/Creature/State.hs
index 2def2d076..436d16542 100644
--- a/src/Dodge/Data/Creature/State.hs
+++ b/src/Dodge/Data/Creature/State.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/CreatureEffect.hs b/src/Dodge/Data/CreatureEffect.hs
index a118734be..cf85cc50c 100644
--- a/src/Dodge/Data/CreatureEffect.hs
+++ b/src/Dodge/Data/CreatureEffect.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Damage.hs b/src/Dodge/Data/Damage.hs
index 87d16d0a1..f4fd78922 100644
--- a/src/Dodge/Data/Damage.hs
+++ b/src/Dodge/Data/Damage.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -7,9 +5,7 @@
 Datatypes describing the type of damage effects that are to be applied to
 creatures.
 -}
-module Dodge.Data.Damage (
-    module Dodge.Data.Damage,
-) where
+module Dodge.Data.Damage where
 
 import Control.Lens
 import Data.Aeson
diff --git a/src/Dodge/Data/Distortion.hs b/src/Dodge/Data/Distortion.hs
index be5b20338..83c704482 100644
--- a/src/Dodge/Data/Distortion.hs
+++ b/src/Dodge/Data/Distortion.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Door.hs b/src/Dodge/Data/Door.hs
index 7a8850a3f..81e8a141e 100644
--- a/src/Dodge/Data/Door.hs
+++ b/src/Dodge/Data/Door.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -22,14 +20,12 @@ import Geometry.Data
 
 data DoorStatus = DoorOpen | DoorClosed | DoorHalfway | DoorInt Int
     deriving Eq
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PushSource
     = PushesItself
     | PushedBy Int
     | NotPushed
     deriving Eq
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Door = Door
     { _drID :: Int
@@ -49,7 +45,6 @@ data Door = Door
     , _drObstructs :: Set PathEdgeNodes
     , _drObstacleType :: EdgeObstacle
     }
-    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Door
 deriveJSON defaultOptions ''DoorStatus
diff --git a/src/Dodge/Data/DoubleTree.hs b/src/Dodge/Data/DoubleTree.hs
index edaad4e81..764600aaf 100644
--- a/src/Dodge/Data/DoubleTree.hs
+++ b/src/Dodge/Data/DoubleTree.hs
@@ -1,6 +1,4 @@
 {-# LANGUAGE LambdaCase #-}
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 --{-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/EnergyBall.hs b/src/Dodge/Data/EnergyBall.hs
index 05db02dd5..8a675120c 100644
--- a/src/Dodge/Data/EnergyBall.hs
+++ b/src/Dodge/Data/EnergyBall.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/EnergyBall/Type.hs b/src/Dodge/Data/EnergyBall/Type.hs
index ed0599522..f923b8267 100644
--- a/src/Dodge/Data/EnergyBall/Type.hs
+++ b/src/Dodge/Data/EnergyBall/Type.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Equipment/Misc.hs b/src/Dodge/Data/Equipment/Misc.hs
index 39b8c5ad4..ed33c6c06 100644
--- a/src/Dodge/Data/Equipment/Misc.hs
+++ b/src/Dodge/Data/Equipment/Misc.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Flame.hs b/src/Dodge/Data/Flame.hs
index ab7fbf8d8..48d58a856 100644
--- a/src/Dodge/Data/Flame.hs
+++ b/src/Dodge/Data/Flame.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/FloatFunction.hs b/src/Dodge/Data/FloatFunction.hs
index 32810dce4..dbcce8153 100644
--- a/src/Dodge/Data/FloatFunction.hs
+++ b/src/Dodge/Data/FloatFunction.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/FloorItem.hs b/src/Dodge/Data/FloorItem.hs
index c56258976..df1376420 100644
--- a/src/Dodge/Data/FloorItem.hs
+++ b/src/Dodge/Data/FloorItem.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -8,12 +6,9 @@ module Dodge.Data.FloorItem where
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
---import Dodge.Data.Item
 import Geometry.Data
 
-
 data FloorItem = FlIt {_flItPos :: Point2, _flItRot :: Float}--, _flItID :: NewInt FloorInt}
-    --deriving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''FloorItem
 deriveJSON defaultOptions ''FloorItem
diff --git a/src/Dodge/Data/ForegroundShape.hs b/src/Dodge/Data/ForegroundShape.hs
index 4dd376985..93dc3fd4e 100644
--- a/src/Dodge/Data/ForegroundShape.hs
+++ b/src/Dodge/Data/ForegroundShape.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/GenFloat.hs b/src/Dodge/Data/GenFloat.hs
index d7d49a571..3380a7efd 100644
--- a/src/Dodge/Data/GenFloat.hs
+++ b/src/Dodge/Data/GenFloat.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 module Dodge.Data.GenFloat
diff --git a/src/Dodge/Data/GenParams.hs b/src/Dodge/Data/GenParams.hs
index 8f44ecb47..f3ef101a0 100644
--- a/src/Dodge/Data/GenParams.hs
+++ b/src/Dodge/Data/GenParams.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Gust.hs b/src/Dodge/Data/Gust.hs
index 958152ed0..aac4a0cf9 100644
--- a/src/Dodge/Data/Gust.hs
+++ b/src/Dodge/Data/Gust.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/HUD.hs b/src/Dodge/Data/HUD.hs
index 0023ba921..b813ed19c 100644
--- a/src/Dodge/Data/HUD.hs
+++ b/src/Dodge/Data/HUD.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Input.hs b/src/Dodge/Data/Input.hs
index 98c6a726f..48e52a79e 100644
--- a/src/Dodge/Data/Input.hs
+++ b/src/Dodge/Data/Input.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Item/Combine.hs b/src/Dodge/Data/Item/Combine.hs
index 4afb9752d..db0a20f30 100644
--- a/src/Dodge/Data/Item/Combine.hs
+++ b/src/Dodge/Data/Item/Combine.hs
@@ -1,4 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Item/Location.hs b/src/Dodge/Data/Item/Location.hs
index 48d94bb51..38e0b1a0e 100644
--- a/src/Dodge/Data/Item/Location.hs
+++ b/src/Dodge/Data/Item/Location.hs
@@ -1,30 +1,32 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE EmptyDataDeriving #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE EmptyDataDeriving #-}
+
 module Dodge.Data.Item.Location where
 
-import NewInt
-import ShortShow
-import Dodge.Data.Equipment.Misc
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
+import Dodge.Data.Equipment.Misc
+import NewInt
+import ShortShow
 
 -- it would be nice to have these as empty types, but I'm not sure how to get
 -- aeson to handle that
 data InvInt = InvInt
-  deriving (Eq,Ord,Show,Read)
+    deriving (Eq, Ord, Show, Read)
+
 data TurretInt
-  deriving (Eq,Ord,Show,Read)
+    deriving (Eq, Ord, Show, Read)
+
 data CrInt = CrInt
-  deriving (Eq,Ord,Show,Read)
+    deriving (Eq, Ord, Show, Read)
+
 data ItmInt = ItmInt
-  deriving (Eq,Ord,Show,Read)
+    deriving (Eq, Ord, Show, Read)
 
 data ItemLocation
-    = InInv 
+    = InInv
         { _ilCrID :: Int
         , _ilInvID :: NewInt InvInt
         , _ilIsRoot :: Bool -- of any item
@@ -33,16 +35,22 @@ data ItemLocation
         , _ilEquipSite :: Maybe EquipSite
         }
     | OnTurret {_ilTuID :: Int}
-    | OnFloor-- {_ilFlID :: NewInt FloorInt}
+    | OnFloor -- {_ilFlID :: NewInt FloorInt}
     | InVoid
     deriving (Eq, Show, Ord, Read) --Generic, Flat)
 
 instance ShortShow ItemLocation where
-    shortShow (InInv cid invid rootb selb attb esite)
-        = "InInv:cid" <> shortShow cid <> "invid"<> shortShow (_unNInt invid)
-            <>"root"<>shortShow rootb<>"sel"<>shortShow selb<>"att"<>shortShow attb<>
-            shortShow (fmap (SString . show) esite)
+    shortShow (InInv cid invid rootb selb attb esite) =
+        "InInv:cid" <> shortShow cid <> "invid" <> shortShow (_unNInt invid)
+            <> "root"
+            <> shortShow rootb
+            <> "sel"
+            <> shortShow selb
+            <> "att"
+            <> shortShow attb
+            <> shortShow (fmap (SString . show) esite)
     shortShow x = show x
+
 --    | OnTurret {_ilTuID :: Int}
 --    | OnFloor-- {_ilFlID :: NewInt FloorInt}
 --    | InVoid
diff --git a/src/Dodge/Data/Item/Misc.hs b/src/Dodge/Data/Item/Misc.hs
index 1fd290b0f..d9075503d 100644
--- a/src/Dodge/Data/Item/Misc.hs
+++ b/src/Dodge/Data/Item/Misc.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Item/Params.hs b/src/Dodge/Data/Item/Params.hs
index 5522c6758..7ab02a9ea 100644
--- a/src/Dodge/Data/Item/Params.hs
+++ b/src/Dodge/Data/Item/Params.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -27,8 +25,6 @@ data ItemParams
 
 data ShrinkGunStatus = FullSize | Shrunk
 
---deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 makeLenses ''ItemParams
 deriveJSON defaultOptions ''ShrinkGunStatus
 deriveJSON defaultOptions ''ItemParams
diff --git a/src/Dodge/Data/Item/Scope.hs b/src/Dodge/Data/Item/Scope.hs
index 54b964e47..e6e467e31 100644
--- a/src/Dodge/Data/Item/Scope.hs
+++ b/src/Dodge/Data/Item/Scope.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Item/Targeting.hs b/src/Dodge/Data/Item/Targeting.hs
index 81587e2e4..3a2312808 100644
--- a/src/Dodge/Data/Item/Targeting.hs
+++ b/src/Dodge/Data/Item/Targeting.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Item/Use.hs b/src/Dodge/Data/Item/Use.hs
index 8285d9602..40f5782da 100644
--- a/src/Dodge/Data/Item/Use.hs
+++ b/src/Dodge/Data/Item/Use.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs b/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs
index 7f0262cd7..1f8437221 100644
--- a/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs
+++ b/src/Dodge/Data/Item/Use/Consumption/LoadAction.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/LWorld.hs b/src/Dodge/Data/LWorld.hs
index 1e26964d0..5e9e4f1e0 100644
--- a/src/Dodge/Data/LWorld.hs
+++ b/src/Dodge/Data/LWorld.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -49,8 +47,6 @@ import Dodge.Data.Equipment.Misc
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
---import Dodge.Data.PathGraph
-
 import qualified Data.Map.Strict as M
 import Dodge.Data.Beam
 import Dodge.Data.Block
diff --git a/src/Dodge/Data/Laser.hs b/src/Dodge/Data/Laser.hs
index a13305a91..8efcde098 100644
--- a/src/Dodge/Data/Laser.hs
+++ b/src/Dodge/Data/Laser.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/LightSource.hs b/src/Dodge/Data/LightSource.hs
index a39db79fc..720af3456 100644
--- a/src/Dodge/Data/LightSource.hs
+++ b/src/Dodge/Data/LightSource.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/LinearShockwave.hs b/src/Dodge/Data/LinearShockwave.hs
index 81469be7d..743ed55f5 100644
--- a/src/Dodge/Data/LinearShockwave.hs
+++ b/src/Dodge/Data/LinearShockwave.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Machine.hs b/src/Dodge/Data/Machine.hs
index 5db59a911..d265cac35 100644
--- a/src/Dodge/Data/Machine.hs
+++ b/src/Dodge/Data/Machine.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Machine/Sensor.hs b/src/Dodge/Data/Machine/Sensor.hs
index c33724acb..b4df46a26 100644
--- a/src/Dodge/Data/Machine/Sensor.hs
+++ b/src/Dodge/Data/Machine/Sensor.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Magnet.hs b/src/Dodge/Data/Magnet.hs
index 7041fec04..bc63c248b 100644
--- a/src/Dodge/Data/Magnet.hs
+++ b/src/Dodge/Data/Magnet.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Material.hs b/src/Dodge/Data/Material.hs
index a2a8b0f77..dafcba5da 100644
--- a/src/Dodge/Data/Material.hs
+++ b/src/Dodge/Data/Material.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Modification.hs b/src/Dodge/Data/Modification.hs
index 2b6f578dc..a1b0cb83b 100644
--- a/src/Dodge/Data/Modification.hs
+++ b/src/Dodge/Data/Modification.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/MountedObject.hs b/src/Dodge/Data/MountedObject.hs
index 0ddb37869..b5bbd50aa 100644
--- a/src/Dodge/Data/MountedObject.hs
+++ b/src/Dodge/Data/MountedObject.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/ObjectType.hs b/src/Dodge/Data/ObjectType.hs
index 56ab9d94d..c51091eaf 100644
--- a/src/Dodge/Data/ObjectType.hs
+++ b/src/Dodge/Data/ObjectType.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/PathGraph.hs b/src/Dodge/Data/PathGraph.hs
index 54f5635a1..d98c3ad7c 100644
--- a/src/Dodge/Data/PathGraph.hs
+++ b/src/Dodge/Data/PathGraph.hs
@@ -1,11 +1,5 @@
---{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
---{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE ScopedTypeVariables #-}
---{-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
---{-# LANGUAGE FlexibleInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 {- |
diff --git a/src/Dodge/Data/Payload.hs b/src/Dodge/Data/Payload.hs
index 6e30ccc67..3f8bbe6ff 100644
--- a/src/Dodge/Data/Payload.hs
+++ b/src/Dodge/Data/Payload.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Projectile.hs b/src/Dodge/Data/Projectile.hs
index 1c3d1ccc0..c2e73fd84 100644
--- a/src/Dodge/Data/Projectile.hs
+++ b/src/Dodge/Data/Projectile.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Prop.hs b/src/Dodge/Data/Prop.hs
index b03b47d10..d14d45a28 100644
--- a/src/Dodge/Data/Prop.hs
+++ b/src/Dodge/Data/Prop.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/RadarBlip.hs b/src/Dodge/Data/RadarBlip.hs
index ee863ed8c..cec560fd5 100644
--- a/src/Dodge/Data/RadarBlip.hs
+++ b/src/Dodge/Data/RadarBlip.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/RadarSweep.hs b/src/Dodge/Data/RadarSweep.hs
index bff0d1c1d..1823a74ef 100644
--- a/src/Dodge/Data/RadarSweep.hs
+++ b/src/Dodge/Data/RadarSweep.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/RightButtonOptions.hs b/src/Dodge/Data/RightButtonOptions.hs
index a1d0c0361..287e51735 100644
--- a/src/Dodge/Data/RightButtonOptions.hs
+++ b/src/Dodge/Data/RightButtonOptions.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/SaveSlot.hs b/src/Dodge/Data/SaveSlot.hs
index 274eed862..136a2814d 100644
--- a/src/Dodge/Data/SaveSlot.hs
+++ b/src/Dodge/Data/SaveSlot.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Shockwave.hs b/src/Dodge/Data/Shockwave.hs
index 471c02913..7de1f2b12 100644
--- a/src/Dodge/Data/Shockwave.hs
+++ b/src/Dodge/Data/Shockwave.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/SoundOrigin.hs b/src/Dodge/Data/SoundOrigin.hs
index 928fb76e2..726bb26fb 100644
--- a/src/Dodge/Data/SoundOrigin.hs
+++ b/src/Dodge/Data/SoundOrigin.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Spark.hs b/src/Dodge/Data/Spark.hs
index 962d24bbc..6a779a4fc 100644
--- a/src/Dodge/Data/Spark.hs
+++ b/src/Dodge/Data/Spark.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -8,7 +6,6 @@ module Dodge.Data.Spark where
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
---import Dodge.Data.Damage.Type
 import Geometry.Data
 
 data Spark = Spark
diff --git a/src/Dodge/Data/Terminal.hs b/src/Dodge/Data/Terminal.hs
index a07aee4bb..36d5ac2da 100644
--- a/src/Dodge/Data/Terminal.hs
+++ b/src/Dodge/Data/Terminal.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/TeslaArc.hs b/src/Dodge/Data/TeslaArc.hs
index b94c75c35..07d943a33 100644
--- a/src/Dodge/Data/TeslaArc.hs
+++ b/src/Dodge/Data/TeslaArc.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/TractorBeam.hs b/src/Dodge/Data/TractorBeam.hs
index 2cba72440..0aa53b9bf 100644
--- a/src/Dodge/Data/TractorBeam.hs
+++ b/src/Dodge/Data/TractorBeam.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Universe.hs b/src/Dodge/Data/Universe.hs
index 3fc7d1131..549fdd52f 100644
--- a/src/Dodge/Data/Universe.hs
+++ b/src/Dodge/Data/Universe.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Wall.hs b/src/Dodge/Data/Wall.hs
index 6b05062c9..27578f051 100644
--- a/src/Dodge/Data/Wall.hs
+++ b/src/Dodge/Data/Wall.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/Wall/Structure.hs b/src/Dodge/Data/Wall/Structure.hs
index 873c94f1a..1a14a60ec 100644
--- a/src/Dodge/Data/Wall/Structure.hs
+++ b/src/Dodge/Data/Wall/Structure.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/World.hs b/src/Dodge/Data/World.hs
index dc6a44654..a4cc59c6d 100644
--- a/src/Dodge/Data/World.hs
+++ b/src/Dodge/Data/World.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/Data/WorldEffect.hs b/src/Dodge/Data/WorldEffect.hs
index df81a267a..18d4eb22d 100644
--- a/src/Dodge/Data/WorldEffect.hs
+++ b/src/Dodge/Data/WorldEffect.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Dodge/GameRoom.hs b/src/Dodge/GameRoom.hs
index 3093680b8..fe54a3b45 100644
--- a/src/Dodge/GameRoom.hs
+++ b/src/Dodge/GameRoom.hs
@@ -1,6 +1,3 @@
---{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Geometry/ConvexPoly.hs b/src/Geometry/ConvexPoly.hs
index fbbb7dd32..4cc3fc911 100644
--- a/src/Geometry/ConvexPoly.hs
+++ b/src/Geometry/ConvexPoly.hs
@@ -1,6 +1,4 @@
 {-# LANGUAGE BangPatterns #-}
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TemplateHaskell #-}
 
 module Geometry.ConvexPoly (
diff --git a/src/MaybeHelp.hs b/src/MaybeHelp.hs
index d704c3bd9..05c7937e4 100644
--- a/src/MaybeHelp.hs
+++ b/src/MaybeHelp.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
diff --git a/src/NewInt.hs b/src/NewInt.hs
index 04853b80b..d505abce3 100644
--- a/src/NewInt.hs
+++ b/src/NewInt.hs
@@ -1,30 +1,30 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DerivingStrategies #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
-{-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE TypeFamilies #-}
+
 --{-# LANGUAGE StandaloneDeriving #-}
 module NewInt where
 
-import qualified Data.IntSet as IS
-import qualified Data.IntMap.Strict as IM
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
+import qualified Data.IntMap.Strict as IM
+import qualified Data.IntSet as IS
 
-newtype NewInt a = NInt { _unNInt :: Int}
-    deriving newtype (Eq,Ord,Show,Num,Read,Integral,Real,Enum)
+newtype NewInt a = NInt {_unNInt :: Int}
+    deriving newtype (Eq, Ord, Show, Num, Read, Integral, Real, Enum)
 
-newtype NewIntSet a = NIntSet { _unNIntSet :: IS.IntSet}
-    deriving newtype (Eq,Ord,Show,Read)
+newtype NewIntSet a = NIntSet {_unNIntSet :: IS.IntSet}
+    deriving newtype (Eq, Ord, Show, Read)
 
-newtype NewIntMap a b = NIntMap { _unNIntMap :: IM.IntMap b}
-    deriving newtype (Foldable,Functor,Monoid,Semigroup)
-    deriving (Eq,Ord,Show,Read)
+newtype NewIntMap a b = NIntMap {_unNIntMap :: IM.IntMap b}
+    deriving newtype (Foldable, Functor, Monoid, Semigroup)
+    deriving (Eq, Ord, Show, Read)
 
 type instance Index (NewIntMap a b) = NewInt a
+
 type instance IxValue (NewIntMap a b) = b
 
 instance Ixed (NewIntMap a b) where
diff --git a/src/Picture/Data.hs b/src/Picture/Data.hs
index 80caf90d6..f5d4340a1 100644
--- a/src/Picture/Data.hs
+++ b/src/Picture/Data.hs
@@ -1,5 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
diff --git a/src/Quaternion.hs b/src/Quaternion.hs
index 2b46c3ac5..eba1a27bd 100644
--- a/src/Quaternion.hs
+++ b/src/Quaternion.hs
@@ -1,7 +1,3 @@
---{-# LANGUAGE DeriveAnyClass #-}
---{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE StandaloneDeriving #-}
---{-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
diff --git a/src/Shape/Data.hs b/src/Shape/Data.hs
index dca1bc403..d390dce21 100644
--- a/src/Shape/Data.hs
+++ b/src/Shape/Data.hs
@@ -1,10 +1,5 @@
---{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DerivingStrategies #-}
-{-# LANGUAGE GeneralisedNewtypeDeriving #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# OPTIONS_GHC -Wno-missing-signatures #-}
 
 module Shape.Data where
 
diff --git a/src/Sound/Data.hs b/src/Sound/Data.hs
index 0fbc55d1f..8801e9930 100644
--- a/src/Sound/Data.hs
+++ b/src/Sound/Data.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
---{-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}