diff --git a/Source/Arbitrary.hs b/Source/Arbitrary.hs
--- a/Source/Arbitrary.hs
+++ b/Source/Arbitrary.hs
@@ -14,7 +14,6 @@
 
 import Lawless
 import Test.QuickCheck (Arbitrary(..), listOf1, suchThat)
-import Text
 import Time
 import Data.Time
 import Data.Time.Clock()
diff --git a/Source/Environment.hs b/Source/Environment.hs
--- a/Source/Environment.hs
+++ b/Source/Environment.hs
@@ -30,8 +30,6 @@
 
 import Lawless
 import IO
-import Text
-import Textual
 
 import qualified System.Environment as SE
 
diff --git a/Source/IO.hs b/Source/IO.hs
--- a/Source/IO.hs
+++ b/Source/IO.hs
@@ -62,7 +62,6 @@
 import qualified System.Path.Directory as D
 import qualified System.Path.IO as PIO
 import qualified Text.IO as TIO
-import Text
 import Textual
 import Printer
 import Path
diff --git a/Source/Lawless.hs b/Source/Lawless.hs
--- a/Source/Lawless.hs
+++ b/Source/Lawless.hs
@@ -12,12 +12,14 @@
     module Data.Maybe,
     module Data.Monoid,
     module Data.Ord,
-    module Data.String,
+    module Data.Text.Lens,
     module Data.Traversable,
     module Either,
     module Functor,
     module List,
     module Monad,
+    module Text,
+    module Textual,
     module Unicode
     ) where
 
@@ -31,7 +33,6 @@
 import Control.Lens hiding (strict)
 import Data.Eq (Eq(..))
 import Data.Ord (Ord(..))
-import Data.String (IsString(..))
 
 import Data.Function
 import Data.Maybe
@@ -41,5 +42,9 @@
 import Data.Foldable hiding (sum, product)
 import Data.Monoid
 import Data.Traversable
+
+import Text (Text, packed, unpacked, IsText(..), IsString(..), Read(..))
+import Data.Text.Lens
+import Textual (Textual(..), Printable(..))
 
 import Unicode
diff --git a/Source/Path.hs b/Source/Path.hs
--- a/Source/Path.hs
+++ b/Source/Path.hs
@@ -102,7 +102,6 @@
     ) where
 
 import Lawless hiding ((<.>))
-import Text
 import System.Path (
     AbsFile,
     RelFile,
diff --git a/Source/Text.hs b/Source/Text.hs
--- a/Source/Text.hs
+++ b/Source/Text.hs
@@ -1,9 +1,11 @@
 module Text (
      module Data.Text,
      module Data.Text.Lens,
-     module Data.Text.ICU.Normalized.NFC
+     module Data.String,
+     module Text.Read
      ) where
 
-import Data.Text.ICU.Normalized.NFC
 import Data.Text (Text, null, empty)
 import Data.Text.Lens
+import Data.String (IsString(..))
+import Text.Read (Read(..))
diff --git a/Source/Time.hs b/Source/Time.hs
--- a/Source/Time.hs
+++ b/Source/Time.hs
@@ -22,7 +22,6 @@
 import Generics
 import IO (MonadIO, liftIO)
 import Lawless
-import Text
 import qualified Textual as T
 import qualified Parser as P
 import Aeson
diff --git a/Tests/TestSTMHub.hs b/Tests/TestSTMHub.hs
deleted file mode 100644
--- a/Tests/TestSTMHub.hs
+++ /dev/null
@@ -1,37 +0,0 @@
-{-# LANGUAGE TemplateHaskell, OverloadedStrings #-}
-{-# OPTIONS_GHC -Wno-orphans #-}
-
-{-|
-Module:             TestSTMHub
-Description:        Test reading lines from text files.
-Copyright:          © 2017 All rights reserved.
-License:            GPL-3
-Maintainer:         Evan Cofsky <evan@theunixman.com>
-Stability:          experimental
-Portability:        POSIX
--}
-
-module TestSTMHub where
-
-import Lawless
-import Text hiding (text)
-import STM
-
-import Arbitrary()
-import Test.Framework
-import Test.Framework.TH
-import Test.Framework.Providers.QuickCheck2 (testProperty)
-import Test.QuickCheck
-import Test.QuickCheck.Monadic
-import Line
-
-default (Text)
-
-prop_CheckSingle ∷ [Line] → Property
-prop_CheckSingle lns = monadicIO $ do
-    
-    m ← run $ readWriteLines lns
-    assert (lns == m)
-
-properties ∷ Test
-properties = $(testGroupGenerator)
diff --git a/liblawless.cabal b/liblawless.cabal
--- a/liblawless.cabal
+++ b/liblawless.cabal
@@ -1,11 +1,11 @@
 name:                liblawless
-version:             0.24.0
+version:             0.25.0
 synopsis:            Prelude based on protolude for GHC 8 and beyond.
 license:             GPL-3
 license-file:        LICENSE
 author:              Evan Cofsky
 maintainer:          evan@theunixman.com
-copyright:           © 2016 Evan Cofsky
+copyright:           © 2017 Evan Cofsky
 homepage:            https://gitlab.com/theunixman/liblawless
 category:            Prelude
 build-type:          Simple
@@ -123,8 +123,6 @@
                 QuickCheck                 >= 2.8 && < 2.10,
                 temporary                  >= 1.2.0 && < 1.3,
                 text                       >= 1.2.2 && < 1.3,
-                text-icu                   >= 0.7.0 && < 0.8,
-                text-icu-normalized        >= 0.4.0 && < 0.5,
                 text-printer               >= 0.4 && < 0.5,
                 time                       >= 1.6.0 && < 1.7,
                 transformers               >= 0.5.2 && < 0.6,