2 files changed, 5 insertions, 9 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index a15fdeb..0fc30ef 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -19,13 +19,12 @@ import Data.Functor
 import Data.Monoid
 import Data.Tuple             ( swap )
 import Data.Bits              ( (.|.) )
-import Control.Applicative    ( Applicative, pure, liftA2, (<$>), (<*>) )
+import Control.Applicative    ( Applicative, pure, liftA2, (<*>) )
 import System.Directory       ( getHomeDirectory, doesFileExist, createDirectoryIfMissing )
 import Control.Arrow          ( first, second )
 import Data.OpenPGP.Util (verify,fingerprint,decryptSecretKey,pgpSign)
 import Data.ByteString.Lazy   ( ByteString )
 import Text.Show.Pretty as PP ( ppShow )
-import Data.Word ( Word8 )
 import Data.Binary {- decode, decodeOrFail -}
 import ControlMaybe ( handleIO_ )
 import Data.ASN1.Types ( toASN1, ASN1Object, fromASN1
@@ -38,7 +37,6 @@ import qualified Data.Map as Map
 import qualified Data.ByteString.Lazy as L ( unpack, pack, null, readFile, writeFile
         , ByteString, toChunks )
 import qualified Data.ByteString      as S ( ByteString, unpack, splitAt, concat, cons, spanEnd, hGetContents, readFile)
-import qualified Data.ByteString.Lazy.Char8 as Char8 ( span, unpack, break, concat, lines )
 import qualified Crypto.Types.PubKey.ECC as ECC
 import qualified Codec.Binary.Base32 as Base32
 import qualified Codec.Binary.Base64 as Base64
@@ -50,10 +48,9 @@ import System.Posix.Files ( modificationTime, getFileStatus
         , setFileCreationMask, setFileTimes )
 import System.FilePath ( takeDirectory )
 import System.IO (hPutStrLn,withFile,IOMode(..))
-import Data.Binary ( encode )
 import Data.IORef
-import System.Posix.IO (fdToHandle,fdRead)
-import qualified Data.Traversable as Traversable (mapM,forM,sequence)
+import System.Posix.IO ( fdToHandle )
+import qualified Data.Traversable as Traversable ( mapM )
 import Data.Traversable ( sequenceA )
 #if ! MIN_VERSION_base(4,6,0)
 import GHC.Exts ( Down(..) )
@@ -1158,7 +1155,6 @@ writeRingKeys krd rt {- db wk secring pubring -} = do
     let isring (KeyRingFile {}) = True
         isring _                = False
         db = rtKeyDB rt
-        wk = rtWorkingKey rt
         secring = rtSecring rt
         pubring = rtPubring rt
     let s = do
@@ -2043,7 +2039,7 @@ merge_ db filename qs = foldl mergeit db (zip [0..] qs)
                                       , fingerprint b
                                       , PP.ppShow b
                                       ]
-        subcomp_m a b = subcomp (packet a) (packet b)
+        -- subcomp_m a b = subcomp (packet a) (packet b)
 
     mergeUid :: Int ->(Packet,a) -> Maybe ([SigAndTrust],OriginMap) -> Maybe ([SigAndTrust],OriginMap)
     mergeUid n (UserIDPacket s,_) Nothing         = Just ([],Map.singleton filename (origin MarkerPacket n))
diff --git a/kiki.cabal b/kiki.cabal
index a5ede74..118e0af 100644
--- a/kiki.cabal
+++ b/kiki.cabal
@@ -23,5 +23,5 @@ Executable kiki
                      unix, time, 
                      containers -any, process -any, filepath -any,
                      network
-    ghc-options:     -O2 -fwarn-unused-binds
+    ghc-options:     -O2 -fwarn-unused-binds -fwarn-unused-imports
     c-sources: dotlock.c