diff --git a/.github/workflows/ormolu.yaml b/.github/workflows/ormolu.yaml
deleted file mode 100644
index a38ea8d2..00000000
--- a/.github/workflows/ormolu.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-# FUTUREWORK: add this to `ci.dhall`?
-# TODO(srk): ^^
-
-name: Ormolu
-on:
-  - pull_request
-
-jobs:
-  ormolu:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: "actions/checkout@v3"
-
-      - uses: "haskell-actions/setup@v2"
-        id: setup-haskell-cabal
-        with:
-          cabal-version: "${{ matrix.cabal }}"
-          enable-stack: false
-          ghc-version: "${{ matrix.ghc }}"
-
-      - uses: "actions/cache@v3"
-        name: Cache
-        with:
-          key: "${{ runner.os }}"
-          path: |
-            "${{ steps.setup-haskell-cabal.outputs.cabal-store }}"
-            ~/.cabal/packages
-            ~/.cabal/store
-            ~/.cabal/bin
-            dist-newstyle
-            ~/.local/bin
-
-      - name: Install dependencies
-        run: |
-          export PATH=$PATH:$HOME/.cabal/bin:$HOME/.local/bin
-          export ORMOLU_VERSION=$(cat ./layout/ormolu.version)
-          (ormolu -v 2>/dev/null | grep -q $ORMOLU_VERSION) || (cabal update && cabal install ormolu --constraint="ormolu ==$ORMOLU_VERSION")
-          test -e $HOME/.local/bin/yq || pip3 install yq
-        shell: bash
-
-      - name: Ormolu
-        run: |
-          export PATH=$PATH:$HOME/.cabal/bin:$HOME/.local/bin
-          ./layout/ormolu.sh -c
-        shell: bash
-
-    strategy:
-      matrix:
-        cabal:
-          - '3.10'
-        ghc:
-          - '9.4.7'
diff --git a/Examples/example11.hs b/Examples/example11.hs
index 643721e9..9ef62ca6 100644
--- a/Examples/example11.hs
+++ b/Examples/example11.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Example 11 - the union of a square and a circle.
 import Graphics.Implicit
 
diff --git a/Examples/example12.hs b/Examples/example12.hs
index ab1f0a81..e97b2721 100644
--- a/Examples/example12.hs
+++ b/Examples/example12.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Example 12 - the rounded union of a square and a circle.
 import Control.Applicative (pure)
 import Graphics.Implicit
diff --git a/Examples/example13.hs b/Examples/example13.hs
index 518c465b..b48ce857 100644
--- a/Examples/example13.hs
+++ b/Examples/example13.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Example 13 - the rounded union of a cube and a sphere.
 import Control.Applicative (pure)
 import Graphics.Implicit
diff --git a/Examples/example16.hs b/Examples/example16.hs
index 2e75bc4f..425d1415 100644
--- a/Examples/example16.hs
+++ b/Examples/example16.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 import Control.Applicative (pure)
 import Graphics.Implicit
 import Graphics.Implicit.Definitions
diff --git a/Examples/example17.hs b/Examples/example17.hs
index 3d09c99f..55175509 100644
--- a/Examples/example17.hs
+++ b/Examples/example17.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Example 17, pulled from our benchmarking suite.
 import Control.Applicative (pure)
 import Prelude ((<$>), ($), zipWith3, fmap, fromIntegral, (*), (/), Bool(..))
diff --git a/Graphics/Implicit.hs b/Graphics/Implicit.hs
index b63131c2..86759d48 100644
--- a/Graphics/Implicit.hs
+++ b/Graphics/Implicit.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Canon.hs b/Graphics/Implicit/Canon.hs
index 5e0bf709..0cb72d62 100644
--- a/Graphics/Implicit/Canon.hs
+++ b/Graphics/Implicit/Canon.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2014 2015 2016, 2017, 2018, Julia Longtin (julial@turinglace.com)
 -- Copyright 2015 2016, Mike MacHenry (mike.machenry@gmail.com)
diff --git a/Graphics/Implicit/Definitions.hs b/Graphics/Implicit/Definitions.hs
index 50f9b2a0..05f46b67 100644
--- a/Graphics/Implicit/Definitions.hs
+++ b/Graphics/Implicit/Definitions.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2014 2015 2016, 2017, 2018, Julia Longtin (julial@turinglace.com)
 -- Copyright 2015 2016, Mike MacHenry (mike.machenry@gmail.com)
diff --git a/Graphics/Implicit/Export.hs b/Graphics/Implicit/Export.hs
index bc342b7e..da10ad82 100644
--- a/Graphics/Implicit/Export.hs
+++ b/Graphics/Implicit/Export.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014 2015, Julia Longtin (julial@turinglace.com)
 -- Copyright (C) 2015 2016, Mike MacHenry (mike.machenry@gmail.com)
diff --git a/Graphics/Implicit/Export/DiscreteAproxable.hs b/Graphics/Implicit/Export/DiscreteAproxable.hs
index 4e72371f..4a585b6b 100644
--- a/Graphics/Implicit/Export/DiscreteAproxable.hs
+++ b/Graphics/Implicit/Export/DiscreteAproxable.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Copyright 2016, Julia Longtin (julial@turinglace.com)
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/NormedTriangleMeshFormats.hs b/Graphics/Implicit/Export/NormedTriangleMeshFormats.hs
index 01572e85..35eab6e4 100644
--- a/Graphics/Implicit/Export/NormedTriangleMeshFormats.hs
+++ b/Graphics/Implicit/Export/NormedTriangleMeshFormats.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016 Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/OutputFormat.hs b/Graphics/Implicit/Export/OutputFormat.hs
index 9364e82e..947e3b6d 100644
--- a/Graphics/Implicit/Export/OutputFormat.hs
+++ b/Graphics/Implicit/Export/OutputFormat.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014 2015, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/PolylineFormats.hs b/Graphics/Implicit/Export/PolylineFormats.hs
index 905b61da..f594e3e0 100644
--- a/Graphics/Implicit/Export/PolylineFormats.hs
+++ b/Graphics/Implicit/Export/PolylineFormats.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/RayTrace.hs b/Graphics/Implicit/Export/RayTrace.hs
index 46abad3d..ff16251c 100644
--- a/Graphics/Implicit/Export/RayTrace.hs
+++ b/Graphics/Implicit/Export/RayTrace.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/Render.hs b/Graphics/Implicit/Export/Render.hs
index bd472b5e..a3723d99 100644
--- a/Graphics/Implicit/Export/Render.hs
+++ b/Graphics/Implicit/Export/Render.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Copyright 2016, Julia Longtin (julial@turinglace.com)
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/Render/Definitions.hs b/Graphics/Implicit/Export/Render/Definitions.hs
index 9454c3a7..3013fed8 100644
--- a/Graphics/Implicit/Export/Render/Definitions.hs
+++ b/Graphics/Implicit/Export/Render/Definitions.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Released under the GNU AGPLV3+, see LICENSE
 
diff --git a/Graphics/Implicit/Export/Render/GetLoops.hs b/Graphics/Implicit/Export/Render/GetLoops.hs
index 5f0ca8d0..1a2eabbf 100644
--- a/Graphics/Implicit/Export/Render/GetLoops.hs
+++ b/Graphics/Implicit/Export/Render/GetLoops.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/Render/GetSegs.hs b/Graphics/Implicit/Export/Render/GetSegs.hs
index fec9c595..9d6e1b45 100644
--- a/Graphics/Implicit/Export/Render/GetSegs.hs
+++ b/Graphics/Implicit/Export/Render/GetSegs.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/Render/HandlePolylines.hs b/Graphics/Implicit/Export/Render/HandlePolylines.hs
index 21a73002..441d26ec 100644
--- a/Graphics/Implicit/Export/Render/HandlePolylines.hs
+++ b/Graphics/Implicit/Export/Render/HandlePolylines.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2012, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/Render/HandleSquares.hs b/Graphics/Implicit/Export/Render/HandleSquares.hs
index db6a87b7..eaa0555b 100644
--- a/Graphics/Implicit/Export/Render/HandleSquares.hs
+++ b/Graphics/Implicit/Export/Render/HandleSquares.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/Render/Interpolate.hs b/Graphics/Implicit/Export/Render/Interpolate.hs
index 320700df..00d9fbc0 100644
--- a/Graphics/Implicit/Export/Render/Interpolate.hs
+++ b/Graphics/Implicit/Export/Render/Interpolate.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/Render/RefineSegs.hs b/Graphics/Implicit/Export/Render/RefineSegs.hs
index dde3bd8e..c6e0765d 100644
--- a/Graphics/Implicit/Export/Render/RefineSegs.hs
+++ b/Graphics/Implicit/Export/Render/RefineSegs.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/Render/TesselateLoops.hs b/Graphics/Implicit/Export/Render/TesselateLoops.hs
index 18bbc33d..6dbe20ed 100644
--- a/Graphics/Implicit/Export/Render/TesselateLoops.hs
+++ b/Graphics/Implicit/Export/Render/TesselateLoops.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/Resolution.hs b/Graphics/Implicit/Export/Resolution.hs
index ba64da29..85f547e6 100644
--- a/Graphics/Implicit/Export/Resolution.hs
+++ b/Graphics/Implicit/Export/Resolution.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014 2015, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/Symbolic/Rebound2.hs b/Graphics/Implicit/Export/Symbolic/Rebound2.hs
index 5d6fc1ac..404fc0d2 100644
--- a/Graphics/Implicit/Export/Symbolic/Rebound2.hs
+++ b/Graphics/Implicit/Export/Symbolic/Rebound2.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016 Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/Symbolic/Rebound3.hs b/Graphics/Implicit/Export/Symbolic/Rebound3.hs
index 0fad2ae5..99620f2c 100644
--- a/Graphics/Implicit/Export/Symbolic/Rebound3.hs
+++ b/Graphics/Implicit/Export/Symbolic/Rebound3.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016 Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/SymbolicFormats.hs b/Graphics/Implicit/Export/SymbolicFormats.hs
index 89bc1e6c..410d832b 100644
--- a/Graphics/Implicit/Export/SymbolicFormats.hs
+++ b/Graphics/Implicit/Export/SymbolicFormats.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016 Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/SymbolicObj2.hs b/Graphics/Implicit/Export/SymbolicObj2.hs
index 169fb724..1ae07da8 100644
--- a/Graphics/Implicit/Export/SymbolicObj2.hs
+++ b/Graphics/Implicit/Export/SymbolicObj2.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/SymbolicObj3.hs b/Graphics/Implicit/Export/SymbolicObj3.hs
index 9c15a03b..cebca793 100644
--- a/Graphics/Implicit/Export/SymbolicObj3.hs
+++ b/Graphics/Implicit/Export/SymbolicObj3.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/TextBuilderUtils.hs b/Graphics/Implicit/Export/TextBuilderUtils.hs
index 6cf465cb..efc4ac4f 100644
--- a/Graphics/Implicit/Export/TextBuilderUtils.hs
+++ b/Graphics/Implicit/Export/TextBuilderUtils.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/TriangleMeshFormats.hs b/Graphics/Implicit/Export/TriangleMeshFormats.hs
index 6fd29b6b..e0ee3a70 100644
--- a/Graphics/Implicit/Export/TriangleMeshFormats.hs
+++ b/Graphics/Implicit/Export/TriangleMeshFormats.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014, 2015, 2016 Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/Export/Util.hs b/Graphics/Implicit/Export/Util.hs
index ac6c697c..2444ad4a 100644
--- a/Graphics/Implicit/Export/Util.hs
+++ b/Graphics/Implicit/Export/Util.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ExtOpenScad.hs b/Graphics/Implicit/ExtOpenScad.hs
index 57d829c1..a734b44f 100644
--- a/Graphics/Implicit/ExtOpenScad.hs
+++ b/Graphics/Implicit/ExtOpenScad.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ExtOpenScad/Default.hs b/Graphics/Implicit/ExtOpenScad/Default.hs
index 5a6d1639..a48ca2b2 100644
--- a/Graphics/Implicit/ExtOpenScad/Default.hs
+++ b/Graphics/Implicit/ExtOpenScad/Default.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ExtOpenScad/Definitions.hs b/Graphics/Implicit/ExtOpenScad/Definitions.hs
index e4a158ac..73e4b20f 100644
--- a/Graphics/Implicit/ExtOpenScad/Definitions.hs
+++ b/Graphics/Implicit/ExtOpenScad/Definitions.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ExtOpenScad/Eval/Constant.hs b/Graphics/Implicit/ExtOpenScad/Eval/Constant.hs
index c39f87b7..5b713321 100644
--- a/Graphics/Implicit/ExtOpenScad/Eval/Constant.hs
+++ b/Graphics/Implicit/ExtOpenScad/Eval/Constant.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ExtOpenScad/Eval/Expr.hs b/Graphics/Implicit/ExtOpenScad/Eval/Expr.hs
index 5ed3e9e9..e6fd57b6 100644
--- a/Graphics/Implicit/ExtOpenScad/Eval/Expr.hs
+++ b/Graphics/Implicit/ExtOpenScad/Eval/Expr.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ExtOpenScad/Eval/Statement.hs b/Graphics/Implicit/ExtOpenScad/Eval/Statement.hs
index dc48f299..d2701e09 100644
--- a/Graphics/Implicit/ExtOpenScad/Eval/Statement.hs
+++ b/Graphics/Implicit/ExtOpenScad/Eval/Statement.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ExtOpenScad/Parser/Expr.hs b/Graphics/Implicit/ExtOpenScad/Parser/Expr.hs
index 6e6e7c2f..3a9905e4 100644
--- a/Graphics/Implicit/ExtOpenScad/Parser/Expr.hs
+++ b/Graphics/Implicit/ExtOpenScad/Parser/Expr.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014-2019 , Julia Longtin (julial@turinglace.com)
 -- Copyright (C) 2016, Kelvin Cookshaw (kelvin@cookshaw.com)
diff --git a/Graphics/Implicit/ExtOpenScad/Parser/Lexer.hs b/Graphics/Implicit/ExtOpenScad/Parser/Lexer.hs
index 224ff351..beced53e 100644
--- a/Graphics/Implicit/ExtOpenScad/Parser/Lexer.hs
+++ b/Graphics/Implicit/ExtOpenScad/Parser/Lexer.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016, Kelvin Cookshaw (kelvin@cookshaw.com)
 -- Copyright 2014 2015 2016, Julia Longtin (julial@turinglace.com)
diff --git a/Graphics/Implicit/ExtOpenScad/Parser/Statement.hs b/Graphics/Implicit/ExtOpenScad/Parser/Statement.hs
index 5c5efd7c..a7f013a0 100644
--- a/Graphics/Implicit/ExtOpenScad/Parser/Statement.hs
+++ b/Graphics/Implicit/ExtOpenScad/Parser/Statement.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ExtOpenScad/Parser/Util.hs b/Graphics/Implicit/ExtOpenScad/Parser/Util.hs
index c0711b39..cc09a4ed 100644
--- a/Graphics/Implicit/ExtOpenScad/Parser/Util.hs
+++ b/Graphics/Implicit/ExtOpenScad/Parser/Util.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016 Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ExtOpenScad/Primitives.hs b/Graphics/Implicit/ExtOpenScad/Primitives.hs
index 8832ba0a..cf0ce1c5 100644
--- a/Graphics/Implicit/ExtOpenScad/Primitives.hs
+++ b/Graphics/Implicit/ExtOpenScad/Primitives.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ExtOpenScad/Util/ArgParser.hs b/Graphics/Implicit/ExtOpenScad/Util/ArgParser.hs
index 05a40b87..6d0f0c22 100644
--- a/Graphics/Implicit/ExtOpenScad/Util/ArgParser.hs
+++ b/Graphics/Implicit/ExtOpenScad/Util/ArgParser.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ExtOpenScad/Util/OVal.hs b/Graphics/Implicit/ExtOpenScad/Util/OVal.hs
index 0ee1d8f1..657670d5 100644
--- a/Graphics/Implicit/ExtOpenScad/Util/OVal.hs
+++ b/Graphics/Implicit/ExtOpenScad/Util/OVal.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014 2015, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ExtOpenScad/Util/StateC.hs b/Graphics/Implicit/ExtOpenScad/Util/StateC.hs
index 6b09ed8b..d47d1df2 100644
--- a/Graphics/Implicit/ExtOpenScad/Util/StateC.hs
+++ b/Graphics/Implicit/ExtOpenScad/Util/StateC.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/FastIntUtil.hs b/Graphics/Implicit/FastIntUtil.hs
index c6548d34..8e592bd1 100644
--- a/Graphics/Implicit/FastIntUtil.hs
+++ b/Graphics/Implicit/FastIntUtil.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2014-2019, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/IntegralUtil.hs b/Graphics/Implicit/IntegralUtil.hs
index f90eef06..c8597941 100644
--- a/Graphics/Implicit/IntegralUtil.hs
+++ b/Graphics/Implicit/IntegralUtil.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2014-2019, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/MathUtil.hs b/Graphics/Implicit/MathUtil.hs
index 2282b7b2..a9f8bc04 100644
--- a/Graphics/Implicit/MathUtil.hs
+++ b/Graphics/Implicit/MathUtil.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ObjectUtil.hs b/Graphics/Implicit/ObjectUtil.hs
index 326373e7..ea2fdcb5 100644
--- a/Graphics/Implicit/ObjectUtil.hs
+++ b/Graphics/Implicit/ObjectUtil.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ObjectUtil/GetBox2.hs b/Graphics/Implicit/ObjectUtil/GetBox2.hs
index f4bb1cf2..4441ee26 100644
--- a/Graphics/Implicit/ObjectUtil/GetBox2.hs
+++ b/Graphics/Implicit/ObjectUtil/GetBox2.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ObjectUtil/GetBox3.hs b/Graphics/Implicit/ObjectUtil/GetBox3.hs
index e1e779cb..d2604dad 100644
--- a/Graphics/Implicit/ObjectUtil/GetBox3.hs
+++ b/Graphics/Implicit/ObjectUtil/GetBox3.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Copyright 2015 2016, Mike MacHenry (mike.machenry@gmail.com)
diff --git a/Graphics/Implicit/ObjectUtil/GetBoxShared.hs b/Graphics/Implicit/ObjectUtil/GetBoxShared.hs
index 6417ed44..fcc7e445 100644
--- a/Graphics/Implicit/ObjectUtil/GetBoxShared.hs
+++ b/Graphics/Implicit/ObjectUtil/GetBoxShared.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Copyright 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Copyright 2015 2016, Mike MacHenry (mike.machenry@gmail.com)
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
diff --git a/Graphics/Implicit/ObjectUtil/GetImplicit2.hs b/Graphics/Implicit/ObjectUtil/GetImplicit2.hs
index 2be52b33..0425c4e3 100644
--- a/Graphics/Implicit/ObjectUtil/GetImplicit2.hs
+++ b/Graphics/Implicit/ObjectUtil/GetImplicit2.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/Graphics/Implicit/ObjectUtil/GetImplicit3.hs b/Graphics/Implicit/ObjectUtil/GetImplicit3.hs
index e1d8da77..db239303 100644
--- a/Graphics/Implicit/ObjectUtil/GetImplicit3.hs
+++ b/Graphics/Implicit/ObjectUtil/GetImplicit3.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Copyright 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Copyright 2015 2016, Mike MacHenry (mike.machenry@gmail.com)
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
diff --git a/Graphics/Implicit/ObjectUtil/GetImplicitShared.hs b/Graphics/Implicit/ObjectUtil/GetImplicitShared.hs
index 0bd6b6d2..69edde4a 100644
--- a/Graphics/Implicit/ObjectUtil/GetImplicitShared.hs
+++ b/Graphics/Implicit/ObjectUtil/GetImplicitShared.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Copyright 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Copyright 2015 2016, Mike MacHenry (mike.machenry@gmail.com)
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
diff --git a/Graphics/Implicit/Primitives.hs b/Graphics/Implicit/Primitives.hs
index d2517222..9d73f161 100644
--- a/Graphics/Implicit/Primitives.hs
+++ b/Graphics/Implicit/Primitives.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/docs/hacking.md b/docs/hacking.md
index 44c0b145..c0775590 100644
--- a/docs/hacking.md
+++ b/docs/hacking.md
@@ -1,4 +1,3 @@
-
 ImplicitCAD Hacking How To
 ==========================
 
diff --git a/layout/ormolu.sh b/layout/ormolu.sh
deleted file mode 100755
index ed19151e..00000000
--- a/layout/ormolu.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-cd "$( dirname "${BASH_SOURCE[0]}" )"
-
-command -v grep >/dev/null 2>&1 || { echo >&2 "grep is not installed, aborting."; exit 1; }
-command -v awk  >/dev/null 2>&1 || { echo >&2 "awk is not installed, aborting."; exit 1; }
-command -v sed  >/dev/null 2>&1 || { echo >&2 "sed is not installed, aborting."; exit 1; }
-command -v yq   >/dev/null 2>&1 || { echo >&2 "yq is not installed, aborting. See https://github.com/mikefarah/yq"; exit 1; }
-
-ORMOLU_VERSION=$(cat ormolu.version)
-( ormolu -v 2>/dev/null | grep -q $ORMOLU_VERSION ) || ( echo "please install ormolu $ORMOLU_VERSION (eg., run 'cabal install ormolu' and ensure ormolu is on your PATH.)"; exit 1 )
-echo "ormolu version: $ORMOLU_VERSION"
-
-ARG_ALLOW_DIRTY_WC="0"
-ARG_ORMOLU_MODE="inplace"
-
-USAGE="
-This bash script can either (a) apply ormolu formatting in-place to
-all haskell modules in your working copy, or (b) check all modules for
-formatting and fail if ormolu needs to be applied.
-
-(a) is mostly for migrating from manually-formatted projects to
-ormolu-formatted ones; (b) can be run in by a continuous integration
-service to make sure no branches with non-ormolu formatting make get
-merged.
-
-For every-day dev work, consider using one of the ormolu editor
-integrations (see https://github.com/tweag/ormolu#editor-integration).
-
-USAGE: $0
-    -h: show this help.
-    -f: run even if working copy is dirty.  default: ${ARG_ALLOW_DIRTY_WC}
-    -c: set ormolu mode to 'check'.  default: 'inplace'
-
-"
-
-# Option parsing:
-# https://sookocheff.com/post/bash/parsing-bash-script-arguments-with-shopts/
-while getopts ":fch" opt; do
-  case ${opt} in
-    f ) ARG_ALLOW_DIRTY_WC="1"
-      ;;
-    c ) ARG_ORMOLU_MODE="check"
-      ;;
-    h ) echo "$USAGE" 1>&2
-         exit 0
-      ;;
-  esac
-done
-shift $((OPTIND -1))
-
-if [ "$#" -ne 0 ]; then
-  echo "$USAGE" 1>&2
-  exit 1
-fi
-
-cd ".."
-
-if [ "$(git status -s | grep -v \?\?)" != "" ]; then
-    echo "working copy not clean."
-    if [ "$ARG_ALLOW_DIRTY_WC" == "1" ]; then
-        echo "running with -f.  this will mix ormolu and other changes."
-    else
-        echo "run with -f if you want to force mixing ormolu and other changes."
-        exit 1
-    fi
-fi
-
-echo "ormolu mode: $ARG_ORMOLU_MODE"
-
-FAILURES=0
-
-for hsfile in $(git ls-files | grep '\.hsc\?$'); do
-    FAILED=0
-    ormolu --mode $ARG_ORMOLU_MODE --check-idempotence $LANGUAGE_EXTS "$hsfile" || FAILED=1
-    if [ "$FAILED" == "1" ]; then
-        ((++FAILURES))
-        echo "$hsfile...  *** FAILED"
-    else
-        echo "$hsfile...  ok"
-    fi
-done
-
-if [ "$FAILURES" != 0 ]; then
-    echo "ormolu failed on $FAILURES files."
-    if [ "$ARG_ORMOLU_MODE" == "check" ]; then
-        echo -en "\n\nyou can fix this by running 'make format' from the git repo root.\n\n"
-    fi
-    exit 1
-fi
diff --git a/layout/ormolu.version b/layout/ormolu.version
deleted file mode 100644
index 934346d8..00000000
--- a/layout/ormolu.version
+++ /dev/null
@@ -1 +0,0 @@
-0.7.3.0
diff --git a/layout/rebase-onto-formatter.sh b/layout/rebase-onto-formatter.sh
deleted file mode 100644
index 0de82b69..00000000
--- a/layout/rebase-onto-formatter.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/usr/bin/env bash
-
-# written by mheinzel
-
-set -euo pipefail
-
-command -v sed  >/dev/null 2>&1 || { echo >&2 "sed is not installed, aborting."; exit 1; }
-
-BASE_COMMIT=${1:-}
-TARGET_COMMIT=${2:-}
-FORMATTING_COMMAND='make formatf'
-USAGE="
-USAGE: $0 BASE_COMMIT TARGET_COMMIT
-
-    BASE_COMMIT:
-        A commit that contains the changes to formatting version and
-        config already from TARGET_COMMIT, but not the automatically
-        applied formatting changes.  Must be the first commit on the
-        branch you are about to rebase (not the one returned by
-        git-merge-base). It will be removed from the resulting branch.
-    TARGET_COMMIT:
-        The commit introducing the formatting that you want to rebase onto.
-
-Rebase a branch onto changes created by an automated formatter. The script
-will keep the (linear) history of the branch intact and make the commits appear
-as if the changes had been applied onto the newly-formatted version all along.
-
-INSTRUCTIONS:
-1. Make a copy of your branch (or be prepared to salvage it from reflog).
-   $ git branch mybranch-backup
-2. Find out what the base commit is.
-3. Rebase onto the base commit yourself.
-   $ git rebase \$BASE_COMMIT
-4. Make sure the formatting tool is installed with the correct version and settings.
-   $ stack install ormolu
-5. Run this script.
-   $ $0 \$BASE_COMMIT \$TARGET_COMMIT
-
-"
-
-if [ -z "$BASE_COMMIT" ] || [ -z "$TARGET_COMMIT" ] || [ -z "$FORMATTING_COMMAND" ]
-then
-  echo "$USAGE" 1>&2
-  exit 1
-fi
-
-echo "Running the script now. This might take a while..."
-
-# The general idea is the following:
-#
-# We have a branch consisting of commits C1, C2, ... on top of our BASE_COMMIT C0.
-# Also, from C0 an automated formatting change f was made on some branch (e.g. develop).
-#
-#  C0 ----> C1 ----> C2 ----> ... ----> Cn
-#  |
-#  f
-#  |
-#  v
-#  C0'
-#
-# Now, how do we obtain versions of our commits operating on the formatted code (let's call them Ci')?
-#
-#  C0 ----> C1 ----> C2 ----> ... ----> Cn
-#  |
-#  f
-#  |
-#  v
-#  C0' ---> C1' ---> C2' ---> ... ----> Cn'
-#
-# One useful thing is that since f is defined by an automated tool,
-# we know f applied at every commit Ci, resulting in a hypothetical Ci'.
-#
-#  C0 ----> C1 ----> C2 ----> ... ----> Cn
-#  |        |        |                  |
-#  f        f        f                  f
-#  |        |        |                  |
-#  v        v        v                  v
-#  C0'      C1'      C2'                Cn'
-#
-# And we can also get its inverse g (applied at Ci') by reverting the commit.
-#
-#  C0 ----> C1 ----> C2 ----> ... ----> Cn
-#  |^       |^       |^                 |^
-#  f|       f|       f|                 f|
-#  |g       |g       |g                 |g
-#  v|       v|       v|                 v|
-#  C0'      C1'      C2'                Cn'
-#
-# Finally, we can get from C(i-1)' to Ci' by composing three arrows:
-# - g at C(i-1)
-# - Ci
-# - f at C1
-#
-#  C0 ----> C1 ----> C2 ----> ... ----> Cn
-#  |^       |^       |^                 |^
-#  f|       f|       f|                 f|
-#  |g       |g       |g                 |g
-#  v|       v|       v|                 v|
-#  C0' ---> C1' ---> C2' ---> ... ----> Cn'
-
-set -x
-
-# edit every commit Ci, adding new commits representing f at Ci and it's inverse g
-git rebase $BASE_COMMIT~1 --exec "$FORMATTING_COMMAND && git commit -am format && git revert HEAD --no-edit"
-
-# drop last commit (do not revert formatting at the end of the branch)
-git reset HEAD~1 --hard
-
-# now for every Ci, squash with the previous and next commit (i.e. g at C(i-1) and f at Ci).
-# However, we want to use Ci's commit message and author.
-# To do this, we run the following command after each group of these 3 commits:
-# Ci=$(git rev-parse HEAD~1); git reset --soft HEAD~3; git commit --reuse-message $Ci
-# We do an interactive rebase, but instead of editing the commit sequence manually,
-# we use sed for that, inserting an `exec` command after every 3 commits.
-GIT_SEQUENCE_EDITOR='sed -i -e "4~3s/^\(pick \S* format\)$/\1\nexec Ci=\$(git rev-parse HEAD~1); git reset --soft HEAD~3; git commit --reuse-message \$Ci/"' \
-  git rebase --interactive $BASE_COMMIT
-
-# rebase onto TARGET_COMMIT.
-# Annoyingly, we still have this first "format" commit that should already be
-# part of the TARGET_COMMIT. So we drop it.
-GIT_SEQUENCE_EDITOR='sed -i "1s/pick/drop/"' \
-  git rebase --interactive $BASE_COMMIT --onto $TARGET_COMMIT
-
-echo "Done."
-echo "Please check that the history looks as it should and all expected commits are there."
diff --git a/programs/Benchmark.hs b/programs/Benchmark.hs
index f51f2425..cf24505a 100644
--- a/programs/Benchmark.hs
+++ b/programs/Benchmark.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/programs/docgen.hs b/programs/docgen.hs
index 97f0460e..c14ef272 100644
--- a/programs/docgen.hs
+++ b/programs/docgen.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Released under the GNU GPL, see LICENSE
 
diff --git a/programs/extopenscad.hs b/programs/extopenscad.hs
index 6a05090a..035d5a83 100644
--- a/programs/extopenscad.hs
+++ b/programs/extopenscad.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014 2015, Julia Longtin (julial@turinglace.com)
 -- Copyright (C) 2014 2016, Mike MacHenry (mike.machenry@gmail.com)
diff --git a/programs/implicitsnap.hs b/programs/implicitsnap.hs
index d55a2b44..5bef9bd1 100644
--- a/programs/implicitsnap.hs
+++ b/programs/implicitsnap.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014 2015, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/programs/parser-bench.hs b/programs/parser-bench.hs
index efc1e144..5aac0bbb 100644
--- a/programs/parser-bench.hs
+++ b/programs/parser-bench.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2016, Kelvin Cookshaw (kelvin@cookshaw.com)
 -- Copyright 2014-2019, Julia Longtin (julial@turinglace.com)
diff --git a/tests/ExecSpec/Expr.hs b/tests/ExecSpec/Expr.hs
index 7c359bf8..0686f47e 100644
--- a/tests/ExecSpec/Expr.hs
+++ b/tests/ExecSpec/Expr.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014-2017, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/tests/ExecSpec/Util.hs b/tests/ExecSpec/Util.hs
index 27d6f555..7cbb4ebd 100644
--- a/tests/ExecSpec/Util.hs
+++ b/tests/ExecSpec/Util.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Copyright 2015 2016, Mike MacHenry (mike.machenry@gmail.com)
diff --git a/tests/GoldenSpec/Spec.hs b/tests/GoldenSpec/Spec.hs
index 02fbbb8f..2da3394a 100644
--- a/tests/GoldenSpec/Spec.hs
+++ b/tests/GoldenSpec/Spec.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 {-# OPTIONS_GHC -fno-warn-missing-import-lists #-}
 {-# OPTIONS_GHC -fno-warn-type-defaults        #-}
 {-# LANGUAGE ScopedTypeVariables #-}
diff --git a/tests/GoldenSpec/Util.hs b/tests/GoldenSpec/Util.hs
index 5c0c6c71..9a60b3d6 100644
--- a/tests/GoldenSpec/Util.hs
+++ b/tests/GoldenSpec/Util.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE LambdaCase   #-}
 
diff --git a/tests/Graphics/Implicit/Test/Instances.hs b/tests/Graphics/Implicit/Test/Instances.hs
index 0aaed2d9..87ece632 100644
--- a/tests/Graphics/Implicit/Test/Instances.hs
+++ b/tests/Graphics/Implicit/Test/Instances.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014 2015 2016, Julia Longtin (julia.longtin@gmail.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/tests/Graphics/Implicit/Test/Utils.hs b/tests/Graphics/Implicit/Test/Utils.hs
index cf5a5301..3240aefe 100644
--- a/tests/Graphics/Implicit/Test/Utils.hs
+++ b/tests/Graphics/Implicit/Test/Utils.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 module Graphics.Implicit.Test.Utils (randomGroups) where
 
 import Prelude (drop, (<*>), (<$>), take, length, pure)
diff --git a/tests/ImplicitSpec.hs b/tests/ImplicitSpec.hs
index 7d460f4f..2bd6328d 100644
--- a/tests/ImplicitSpec.hs
+++ b/tests/ImplicitSpec.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 {-# LANGUAGE ExplicitNamespaces #-}
 {-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE ConstraintKinds     #-}
diff --git a/tests/Main.hs b/tests/Main.hs
index 6d862a09..9967fead 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2018, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/tests/MessageSpec/Message.hs b/tests/MessageSpec/Message.hs
index df82e471..bb9d0c83 100644
--- a/tests/MessageSpec/Message.hs
+++ b/tests/MessageSpec/Message.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014-2017, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/tests/MessageSpec/Util.hs b/tests/MessageSpec/Util.hs
index b6a50cc7..07781956 100644
--- a/tests/MessageSpec/Util.hs
+++ b/tests/MessageSpec/Util.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Copyright 2015 2016, Mike MacHenry (mike.machenry@gmail.com)
diff --git a/tests/NOTES b/tests/NOTES
index 5803fbeb..9c4d7205 100644
--- a/tests/NOTES
+++ b/tests/NOTES
@@ -1,2 +1 @@
-
 https://github.com/nmz787/microfluidic-cad: GPLV2 or greater
diff --git a/tests/ParserSpec/Expr.hs b/tests/ParserSpec/Expr.hs
index 1e4cfad0..0d68873f 100644
--- a/tests/ParserSpec/Expr.hs
+++ b/tests/ParserSpec/Expr.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014-2017, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/tests/ParserSpec/Statement.hs b/tests/ParserSpec/Statement.hs
index 701dd4b0..64523009 100644
--- a/tests/ParserSpec/Statement.hs
+++ b/tests/ParserSpec/Statement.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014-2017, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/tests/ParserSpec/Util.hs b/tests/ParserSpec/Util.hs
index 6e824bf4..1aa3e15b 100644
--- a/tests/ParserSpec/Util.hs
+++ b/tests/ParserSpec/Util.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright 2014 2015 2016, Julia Longtin (julial@turinglace.com)
 -- Copyright 2015 2016, Mike MacHenry (mike.machenry@gmail.com)
diff --git a/tests/PropertySpec.hs b/tests/PropertySpec.hs
index 57f80bd4..a26a8a7f 100644
--- a/tests/PropertySpec.hs
+++ b/tests/PropertySpec.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 module PropertySpec
   ( propSpec
   ) where
diff --git a/tests/PropertySpec/Exec.hs b/tests/PropertySpec/Exec.hs
index 0e3ec4c2..69b5e3cb 100644
--- a/tests/PropertySpec/Exec.hs
+++ b/tests/PropertySpec/Exec.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 module PropertySpec.Exec
   ( additionSpec
   , subtractionSpec
diff --git a/tests/RewriteSpec.hs b/tests/RewriteSpec.hs
index 214b1d90..0505271b 100644
--- a/tests/RewriteSpec.hs
+++ b/tests/RewriteSpec.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 -- Implicit CAD. Copyright (C) 2011, Christopher Olah (chris@colah.ca)
 -- Copyright (C) 2014-2017, Julia Longtin (julial@turinglace.com)
 -- Released under the GNU AGPLV3+, see LICENSE
diff --git a/tests/TesselationSpec.hs b/tests/TesselationSpec.hs
index 5c1d2cf9..ebbce4ab 100644
--- a/tests/TesselationSpec.hs
+++ b/tests/TesselationSpec.hs
@@ -1,4 +1,3 @@
-{- ORMOLU_DISABLE -}
 {-# LANGUAGE ImplicitPrelude  #-}
 {-# LANGUAGE TupleSections    #-}
 {-# LANGUAGE TypeApplications #-}