diff --git a/cimple.cabal b/cimple.cabal
--- a/cimple.cabal
+++ b/cimple.cabal
@@ -1,5 +1,5 @@
 name:                 cimple
-version:              0.0.9
+version:              0.0.10
 synopsis:             Simple C-like programming language
 homepage:             https://toktok.github.io/
 license:              GPL-3
diff --git a/src/Language/Cimple.hs b/src/Language/Cimple.hs
--- a/src/Language/Cimple.hs
+++ b/src/Language/Cimple.hs
@@ -2,12 +2,9 @@
     ( module X
     , AstActions
     , defaultActions
-    , AstActions'
-    , defaultActions'
     ) where
 
-import           Control.Monad.State.Lazy    (State)
-import qualified Control.Monad.State.Strict  as SState
+import           Control.Monad.State.Strict  (State)
 import           Data.Text                   (Text)
 
 import           Language.Cimple.Annot       as X
@@ -21,8 +18,3 @@
 
 defaultActions :: AstActions state
 defaultActions = X.identityActions
-
-type AstActions' a = X.IdentityActions (SState.State a) Text
-
-defaultActions' :: AstActions' state
-defaultActions' = X.identityActions
diff --git a/src/Language/Cimple/Diagnostics.hs b/src/Language/Cimple/Diagnostics.hs
--- a/src/Language/Cimple/Diagnostics.hs
+++ b/src/Language/Cimple/Diagnostics.hs
@@ -4,10 +4,8 @@
 {-# LANGUAGE StrictData        #-}
 module Language.Cimple.Diagnostics
   ( Diagnostics
-  , Diagnostics' -- deprecated
   , HasDiagnostics (..)
   , warn
-  , warn' -- deprecated
   , sloc
   ) where
 
@@ -22,13 +20,11 @@
 
 type DiagnosticsT diags a = State diags a
 type Diagnostics a = DiagnosticsT [Text] a
-type Diagnostics' a = Diagnostics a
 
-warn, warn'
+warn
     :: (HasLocation at, HasDiagnostics diags)
     => FilePath -> at -> Text -> DiagnosticsT diags ()
 warn file l w = State.modify (addDiagnostic $ sloc file l <> ": " <> w)
-warn' = warn
 
 
 class HasDiagnostics a where
diff --git a/src/Language/Cimple/SemCheck/Includes.hs b/src/Language/Cimple/SemCheck/Includes.hs
--- a/src/Language/Cimple/SemCheck/Includes.hs
+++ b/src/Language/Cimple/SemCheck/Includes.hs
@@ -5,8 +5,8 @@
   , normaliseIncludes
   ) where
 
-import           Control.Monad.State.Lazy        (State)
-import qualified Control.Monad.State.Lazy        as State
+import           Control.Monad.State.Strict      (State)
+import qualified Control.Monad.State.Strict      as State
 import           Data.Fix                        (Fix (..))
 import           Data.Text                       (Text)
 import qualified Data.Text                       as Text