diff --git a/Data/Hackage/DeprecationInfo.hs b/Data/Hackage/DeprecationInfo.hs
index 9bdbd90..238a4f5 100644
--- a/Data/Hackage/DeprecationInfo.hs
+++ b/Data/Hackage/DeprecationInfo.hs
@@ -23,8 +23,8 @@ instance FromJSON HackageDeprecationInfo where
     }
 
 data DeprecationRecord = DeprecationRecord {
-  deprecatedPackage :: PackageName,
-  deprecatedInFavourOf :: [PackageName]
+  _deprecatedPackage :: PackageName,
+  _deprecatedInFavourOf :: [PackageName]
 }
 
 instance FromJSON DeprecationRecord where
diff --git a/Handler/Haddock.hs b/Handler/Haddock.hs
index feccdce..0f921fa 100644
--- a/Handler/Haddock.hs
+++ b/Handler/Haddock.hs
@@ -9,32 +9,27 @@ module Handler.Haddock
     , dirRawIdent
     , dirGzIdent
     , dirHoogleIdent
+    , createCompressor
     ) where
 
-import Import
-import Data.BlobStore
-import Filesystem (removeTree, isDirectory, createTree, isFile, rename, removeFile, removeDirectory, listDirectory)
-import System.Directory (getTemporaryDirectory)
-import Control.Concurrent (forkIO)
-import System.IO.Temp (withSystemTempFile, withTempFile, createTempDirectory)
-import System.Process (createProcess, proc, cwd, waitForProcess)
-import System.Exit (ExitCode (ExitSuccess))
-import Network.Mime (defaultMimeLookup)
-import Crypto.Hash.Conduit (sinkHash)
-import System.IO (IOMode (ReadMode, WriteMode), withBinaryFile, openBinaryFile)
-import Data.Conduit.Zlib (gzip)
-import System.Posix.Files (createLink)
+import           Control.Concurrent (forkIO)
+import           Crypto.Hash (Digest, SHA1)
+import           Crypto.Hash.Conduit (sinkHash)
+import           Data.Aeson (withObject)
+import           Data.BlobStore
 import qualified Data.ByteString.Base16 as B16
-import Data.Byteable (toBytes)
-import Crypto.Hash (Digest, SHA1)
-import qualified Filesystem.Path.CurrentOS as F
-import Data.Slug (SnapSlug, unSlug)
+import           Data.Byteable (toBytes)
+import           Data.Conduit.Zlib (gzip)
+import           Data.Slug (SnapSlug, unSlug)
 import qualified Data.Text as T
 import qualified Data.Yaml as Y
-import Data.Aeson (withObject)
-import qualified Hoogle
-import Data.Char (isAlpha)
-import Control.Monad.Trans.Resource (allocate, resourceForkIO, release)
+import           Filesystem (isDirectory, createTree, isFile, rename, removeFile, removeDirectory)
+import qualified Filesystem.Path.CurrentOS as F
+import           Import
+import           Network.Mime (defaultMimeLookup)
+import           System.IO (IOMode (ReadMode), withBinaryFile)
+import           System.IO.Temp (withTempFile)
+import           System.Posix.Files (createLink)
 
 form :: Form FileInfo
 form = renderDivs $ areq fileField "tarball containing docs"
diff --git a/Handler/PackageList.hs b/Handler/PackageList.hs
index 0fc21b0..aab68ce 100644
--- a/Handler/PackageList.hs
+++ b/Handler/PackageList.hs
@@ -1,10 +1,10 @@
 module Handler.PackageList where
 
 import qualified Data.HashMap.Strict as M
-import           Data.Time (NominalDiffTime, addUTCTime)
+import           Data.Time (NominalDiffTime)
 import qualified Database.Esqueleto as E
 import           Import
-import           Yesod.Core.Types (WidgetT (WidgetT), unWidgetT)
+
 
 -- FIXME maybe just redirect to the LTS or nightly package list
 getPackageListR :: Handler Html