diff --git a/yesod-core/Yesod/Core/Json.hs b/yesod-core/Yesod/Core/Json.hs
index e000ca77..2d01f691 100644
--- a/yesod-core/Yesod/Core/Json.hs
+++ b/yesod-core/Yesod/Core/Json.hs
@@ -27,12 +27,11 @@ module Yesod.Core.Json
     , acceptsJson
     ) where
 
-import Yesod.Core.Handler (HandlerT, getRequest, invalidArgs, redirect, selectRep, provideRep, rawRequestBody, ProvidedRep)
+import Yesod.Core.Handler (getRequest, invalidArgs, redirect,  provideRep, rawRequestBody, ProvidedRep)
 import Control.Monad.Trans.Writer (Writer)
 import Data.Monoid (Endo)
-import Yesod.Core.Content (TypedContent)
 import Yesod.Core.Types (reqAccept)
-import Yesod.Core.Class.Yesod (Yesod, defaultLayoutJson)
+import Yesod.Core.Class.Yesod (defaultLayoutJson)
 import Yesod.Core.Class.Handler
 import Yesod.Routes.Class
 import qualified Data.Aeson as J
diff --git a/yesod-core/test/YesodCoreTest/Cache.hs b/yesod-core/test/YesodCoreTest/Cache.hs
index bbd34b23..30a312e0 100644
--- a/yesod-core/test/YesodCoreTest/Cache.hs
+++ b/yesod-core/test/YesodCoreTest/Cache.hs
@@ -13,8 +13,6 @@ import Yesod.Core
 import Data.IORef.Lifted
 import Data.Typeable (Typeable)
 import qualified Data.ByteString.Lazy.Char8 as L8
-import Data.Text (Text)
-import Data.Text.Encoding (encodeUtf8)
 
 data C = C
 
diff --git a/yesod-core/test/YesodCoreTest/ErrorHandling.hs b/yesod-core/test/YesodCoreTest/ErrorHandling.hs
index abc184fd..c7aa9ec6 100644
--- a/yesod-core/test/YesodCoreTest/ErrorHandling.hs
+++ b/yesod-core/test/YesodCoreTest/ErrorHandling.hs
@@ -6,11 +6,9 @@ module YesodCoreTest.ErrorHandling
     ) where
 import Yesod.Core
 import Text.Hamlet (hamlet)
-import Yesod.Core.Widget
 import Test.Hspec
 import Network.Wai
 import Network.Wai.Test
-import Text.Hamlet (hamlet)
 import qualified Data.ByteString.Lazy as L
 import qualified Data.ByteString.Char8 as S8
 import Control.Exception (SomeException, try)
diff --git a/yesod-core/test/YesodCoreTest/JsLoader.hs b/yesod-core/test/YesodCoreTest/JsLoader.hs
index 2d0a7780..15956553 100644
--- a/yesod-core/test/YesodCoreTest/JsLoader.hs
+++ b/yesod-core/test/YesodCoreTest/JsLoader.hs
@@ -8,7 +8,6 @@ import YesodCoreTest.JsLoaderSites.Bottom (B(..))
 import Test.Hspec
 
 import Yesod.Core
-import Yesod.Core.Widget
 import Network.Wai.Test
 
 data H = H
diff --git a/yesod-core/test/YesodCoreTest/Links.hs b/yesod-core/test/YesodCoreTest/Links.hs
index 1c875f91..f8af9da0 100644
--- a/yesod-core/test/YesodCoreTest/Links.hs
+++ b/yesod-core/test/YesodCoreTest/Links.hs
@@ -6,7 +6,6 @@ module YesodCoreTest.Links (linksTest) where
 import Test.Hspec
 
 import Yesod.Core
-import Yesod.Core.Widget
 import Text.Hamlet
 import Network.Wai
 import Network.Wai.Test
diff --git a/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs b/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs
index 803b723a..740add8e 100644
--- a/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs
+++ b/yesod-core/test/YesodCoreTest/NoOverloadedStrings.hs
@@ -7,7 +7,6 @@ import Test.Hspec
 import YesodCoreTest.NoOverloadedStringsSub
 
 import Yesod.Core
-import Yesod.Core.Widget
 import Text.Hamlet (hamlet)
 import Network.Wai.Test
 import Network.Wai (pathInfo)
diff --git a/yesod-core/test/YesodCoreTest/NoOverloadedStringsSub.hs b/yesod-core/test/YesodCoreTest/NoOverloadedStringsSub.hs
index 510ca3c9..e8be9c14 100644
--- a/yesod-core/test/YesodCoreTest/NoOverloadedStringsSub.hs
+++ b/yesod-core/test/YesodCoreTest/NoOverloadedStringsSub.hs
@@ -8,7 +8,6 @@
 module YesodCoreTest.NoOverloadedStringsSub where
 
 import Yesod.Core
-import Network.Wai
 import Yesod.Core.Types
 
 data Subsite = Subsite (forall master. Yesod master => YesodSubRunnerEnv Subsite master (HandlerT master IO) -> Application)
diff --git a/yesod-core/test/YesodCoreTest/RawResponse.hs b/yesod-core/test/YesodCoreTest/RawResponse.hs
index cb4b5db5..3af1b9c7 100644
--- a/yesod-core/test/YesodCoreTest/RawResponse.hs
+++ b/yesod-core/test/YesodCoreTest/RawResponse.hs
@@ -3,11 +3,7 @@ module YesodCoreTest.RawResponse (specs) where
 
 import Yesod.Core
 import Test.Hspec
-import qualified Data.Map as Map
-import Network.Wai.Test
 import Network.Wai (responseStream)
-import Data.Text (Text)
-import Data.ByteString.Lazy (ByteString)
 import qualified Data.Conduit.List as CL
 import qualified Data.ByteString.Char8 as S8
 import Data.Conduit
diff --git a/yesod-shakespeare/yesod-shakespeare.cabal b/yesod-shakespeare/yesod-shakespeare.cabal
index a680d595..627e1f98 100644
--- a/yesod-shakespeare/yesod-shakespeare.cabal
+++ b/yesod-shakespeare/yesod-shakespeare.cabal
@@ -31,7 +31,7 @@ library
 
     exposed-modules: Yesod.Shakespeare
 
-    ghc-options:     -Wall -ddump-splices -ddump-to-file
+    ghc-options:     -Wall
     -- Following line added due to: https://github.com/yesodweb/yesod/issues/545
     -- This looks like a GHC bug
     extensions:      MultiParamTypeClasses