30 files changed, 21 insertions, 206 deletions

diff --git a/src/Control/Concurrent/Lifted/Instrument.hs b/src/Control/Concurrent/Lifted/Instrument.hs
index 187b9276..4aa9268f 100644
--- a/src/Control/Concurrent/Lifted/Instrument.hs
+++ b/src/Control/Concurrent/Lifted/Instrument.hs
@@ -20,8 +20,6 @@ import Control.Monad.Base
 import qualified GHC.Conc as GHC
 import Data.Time()
 import Data.Time.Clock
-import System.IO
-import Control.Monad.IO.Class
 import DPut
 
 
diff --git a/src/Crypto/Tox.hs b/src/Crypto/Tox.hs
index a1741a1f..a1f40c76 100644
--- a/src/Crypto/Tox.hs
+++ b/src/Crypto/Tox.hs
@@ -89,7 +89,6 @@ import Foreign.Marshal.Alloc
 import Foreign.Ptr
 import Foreign.Storable
 import System.Endian
-import qualified Data.ByteString.Internal
 import Control.Concurrent.STM
 #ifdef CRYPTONITE_BACKPORT
 import Crypto.ECC.Class
diff --git a/src/DPut.hs b/src/DPut.hs
index 73d142b7..e02f8ce6 100644
--- a/src/DPut.hs
+++ b/src/DPut.hs
@@ -1,11 +1,9 @@
 module DPut where
 
 import Control.Monad.IO.Class
-import Control.Concurrent.STM
 import qualified Data.Map.Strict as Map
 import Data.Maybe
 import Data.IORef
-import System.IO (stderr,hPutStrLn)
 import System.IO.Unsafe (unsafePerformIO)
 import System.Log.Logger
 import qualified Data.ByteString.Char8 as B
diff --git a/src/Data/BEncode/Pretty.hs b/src/Data/BEncode/Pretty.hs
index 89fcb489..8beb101b 100644
--- a/src/Data/BEncode/Pretty.hs
+++ b/src/Data/BEncode/Pretty.hs
@@ -4,11 +4,9 @@ module Data.BEncode.Pretty where -- (showBEncode) where
 import Data.BEncode.Types
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as BL
-import qualified Data.ByteString.Lazy.Char8 as BL8
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Text.Encoding
-import Text.Printf
 import qualified Data.ByteString.Base16 as Base16
 #ifdef BENCODE_AESON
 import Data.BEncode.BDict hiding (map)
diff --git a/src/Data/CyclicBuffer.hs b/src/Data/CyclicBuffer.hs
index 0cc87459..92b6bacc 100644
--- a/src/Data/CyclicBuffer.hs
+++ b/src/Data/CyclicBuffer.hs
@@ -4,9 +4,7 @@ module Data.CyclicBuffer {- TODO: export list -} where
 
 
 import Control.Concurrent.STM
-import Control.Concurrent.STM.TArray
 import Control.Monad
-import Control.Applicative
 import Data.Word
 import Data.Array.MArray
 import Data.Maybe
diff --git a/src/Data/PacketQueue.hs b/src/Data/PacketQueue.hs
index ffe00d7d..93f9ba14 100644
--- a/src/Data/PacketQueue.hs
+++ b/src/Data/PacketQueue.hs
@@ -30,9 +30,7 @@ module Data.PacketQueue
     ) where
 
 import Control.Concurrent.STM
-import Control.Concurrent.STM.TArray
 import Control.Monad
-import Control.Applicative
 import Data.Word
 import Data.Array.MArray
 import Data.Maybe
diff --git a/src/Data/Torrent.hs b/src/Data/Torrent.hs
index dbe248eb..a746b54c 100644
--- a/src/Data/Torrent.hs
+++ b/src/Data/Torrent.hs
@@ -195,7 +195,6 @@ import System.FilePath
 import System.Posix.Types
 
 import Network.Address
-import Network.Kademlia.Routing
 
 
 {-----------------------------------------------------------------------
diff --git a/src/Data/Word64RangeMap.hs b/src/Data/Word64RangeMap.hs
index 0b25f56d..f4736d59 100644
--- a/src/Data/Word64RangeMap.hs
+++ b/src/Data/Word64RangeMap.hs
@@ -12,11 +12,9 @@ import Data.Word
 import Data.Array.Unboxed
 import qualified Data.Array.MArray as MA
 import Data.Array.MArray (MArray(..))
-import qualified Data.Array.Base as Base
 import Data.Reference
 import Debug.Trace
 import Control.Concurrent.STM
-import Control.Concurrent.STM.TArray
 import Data.Array.IO
 import Data.IORef
 
diff --git a/src/Data/Wrapper/PSQ.hs b/src/Data/Wrapper/PSQ.hs
index 631af6ec..5d32e16c 100644
--- a/src/Data/Wrapper/PSQ.hs
+++ b/src/Data/Wrapper/PSQ.hs
@@ -19,8 +19,8 @@ fold' f a q = PSQueue.foldr f' a q
 #else
     ( module Data.Wrapper.PSQ , module HashPSQ ) where
 
-import Data.OrdPSQ as OrdPSQ hiding (insert, map, singleton, minView)
-import qualified Data.OrdPSQ as OrdPSQ
+-- import Data.OrdPSQ as OrdPSQ hiding (insert, map, singleton, minView)
+-- import qualified Data.OrdPSQ as OrdPSQ
 
 import Data.HashPSQ as HashPSQ hiding (insert, map, singleton, minView)
 import qualified Data.HashPSQ as Q
diff --git a/src/Network/Address.hs b/src/Network/Address.hs
index 367f608b..3adfdc91 100644
--- a/src/Network/Address.hs
+++ b/src/Network/Address.hs
@@ -110,10 +110,9 @@ import Data.IP
 #endif
 import Data.List as L
 import Data.List.Split as L
-import Data.Maybe       (fromMaybe, catMaybes, mapMaybe)
+import Data.Maybe       (fromMaybe, catMaybes)
 import Data.Monoid
 import Data.Hashable
-import Data.Ord
 import Data.Serialize as S
 import Data.String
 import Data.Time
@@ -130,7 +129,6 @@ import Text.PrettyPrint.HughesPJClass hiding ((<>),($$))
 import System.Locale    (defaultTimeLocale)
 #endif
 import System.Entropy
-import System.IO (stderr)
 import DPut
 
 -- import Paths_bittorrent (version)
diff --git a/src/Network/BitTorrent/DHT/ContactInfo.hs b/src/Network/BitTorrent/DHT/ContactInfo.hs
index ed38caf7..ec7e6658 100644
--- a/src/Network/BitTorrent/DHT/ContactInfo.hs
+++ b/src/Network/BitTorrent/DHT/ContactInfo.hs
@@ -20,7 +20,6 @@ import Data.Wrapper.PSQ as PSQ
 import Data.Time.Clock.POSIX
 import Data.ByteString (ByteString)
 import Data.Word
-import Network.Socket (SockAddr(..))
 
 import Data.Torrent
 import Network.Address
diff --git a/src/Network/BitTorrent/DHT/Token.hs b/src/Network/BitTorrent/DHT/Token.hs
index 3da59c53..171cc8be 100644
--- a/src/Network/BitTorrent/DHT/Token.hs
+++ b/src/Network/BitTorrent/DHT/Token.hs
@@ -61,7 +61,6 @@ import Data.String
 import Data.Time
 import System.Random
 import Control.Concurrent.STM
-import Network.Address
 
 -- TODO use ShortByteString
 
diff --git a/src/Network/BitTorrent/MainlineDHT.hs b/src/Network/BitTorrent/MainlineDHT.hs
index 626f980f..c5b99234 100644
--- a/src/Network/BitTorrent/MainlineDHT.hs
+++ b/src/Network/BitTorrent/MainlineDHT.hs
@@ -23,10 +23,9 @@ import qualified Data.BEncode.BDict           as BE
 import Data.BEncode.Pretty
 import Data.BEncode.Types                     (BDict)
 import Data.Bits
-import Data.Bits.ByteString
+import Data.Bits.ByteString                   ()
 import Data.Bool
-import qualified Data.ByteArray               as BA
-         ;import Data.ByteArray               (ByteArrayAccess)
+import Data.ByteArray                         (ByteArrayAccess)
 import qualified Data.ByteString              as B
          ;import Data.ByteString              (ByteString)
 import qualified Data.ByteString.Base16       as Base16
@@ -45,7 +44,6 @@ import Data.IP hiding (fromSockAddr)
 #else
 import Data.IP
 #endif
-import Data.List
 import Data.Maybe
 import Data.Monoid
 import Data.Ord
@@ -53,14 +51,13 @@ import qualified Data.Serialize               as S
 import Data.Set                               (Set)
 import Data.Time.Clock.POSIX                  (POSIXTime, getPOSIXTime)
 import Data.Torrent
-import Data.Typeable
 import Data.Word
 import qualified Data.Wrapper.PSQInt          as Int
 import Debug.Trace
 import Network.BitTorrent.MainlineDHT.Symbols
 import Network.Kademlia
 import Network.Kademlia.Bootstrap
-import Network.Address                        (Address, fromAddr, fromSockAddr,
+import Network.Address                        (fromSockAddr,
                                                setPort, sockAddrPort, testIdBit,
                                                toSockAddr, genBucketSample', WantIP(..),
                                                un4map,either4or6,ipFamily)
@@ -68,10 +65,9 @@ import Network.BitTorrent.DHT.ContactInfo     as Peers
 import Network.Kademlia.Search          (Search (..))
 import Network.BitTorrent.DHT.Token           as Token
 import qualified Network.Kademlia.Routing          as R
-         ;import Network.Kademlia.Routing          (Timestamp, getTimestamp)
+         ;import Network.Kademlia.Routing          (getTimestamp)
 import Network.QueryResponse
 import Network.Socket
-import System.IO
 import System.IO.Error
 import System.IO.Unsafe                       (unsafeInterleaveIO)
 import qualified Text.ParserCombinators.ReadP as RP
@@ -81,7 +77,6 @@ import Control.Concurrent.Lifted.Instrument
 import Control.Concurrent.Lifted
 import GHC.Conc                  (labelThread)
 #endif
-import Control.Exception    (SomeException (..), handle)
 import qualified Data.Aeson as JSON
          ;import Data.Aeson (FromJSON, ToJSON, (.=))
 import Text.Read
diff --git a/src/Network/Kademlia.hs b/src/Network/Kademlia.hs
index 50c98967..44ef2ec1 100644
--- a/src/Network/Kademlia.hs
+++ b/src/Network/Kademlia.hs
@@ -6,11 +6,8 @@
 {-# LANGUAGE PatternSynonyms #-}
 module Network.Kademlia where
 
-import Data.Function
 import Data.Maybe
-import qualified Data.Set as Set
-import Data.Time.Clock       (getCurrentTime)
-import Data.Time.Clock.POSIX (getPOSIXTime, utcTimeToPOSIXSeconds)
+import Data.Time.Clock.POSIX
 import Network.Kademlia.Routing   as R
 #ifdef THREAD_DEBUG
 import Control.Concurrent.Lifted.Instrument
@@ -20,24 +17,7 @@ import GHC.Conc                  (labelThread)
 #endif
 import Control.Concurrent.STM
 import Control.Monad
-import Data.Bits
-import Data.Hashable
-#if MIN_VERSION_iproute(1,7,4)
-import Data.IP hiding (fromSockAddr)
-#else
-import Data.IP
-#endif
-import Data.Monoid
-import Data.Serialize                 (Serialize)
 import Data.Time.Clock.POSIX          (POSIXTime)
-import Network.Address                (bucketRange,genBucketSample)
-import Network.Kademlia.Search
-import System.Entropy
-import System.Timeout
-import Text.PrettyPrint               as PP hiding (($$), (<>))
-import Text.PrettyPrint.HughesPJClass hiding (($$), (<>))
-import System.IO
-import Control.Concurrent.Tasks
 
 -- | The status of a given node with respect to a given routint table.
 data RoutingStatus
@@ -147,7 +127,7 @@ accepted (_,y) = RoutingTransition y Accepted
 insertNode :: Kademlia nid ni -> ni -> IO ()
 insertNode (Kademlia reporter space io) node = do
 
-  tm <- utcTimeToPOSIXSeconds <$> getCurrentTime
+  tm <- getPOSIXTime
 
   (ps,reaction) <- atomically $ do
     tbl <- tblRead io
diff --git a/src/Network/Kademlia/Bootstrap.hs b/src/Network/Kademlia/Bootstrap.hs
index 4197e06e..1a70a9c5 100644
--- a/src/Network/Kademlia/Bootstrap.hs
+++ b/src/Network/Kademlia/Bootstrap.hs
@@ -16,8 +16,7 @@ module Network.Kademlia.Bootstrap where
 import Data.Function
 import Data.Maybe
 import qualified Data.Set as Set
-import Data.Time.Clock       (getCurrentTime)
-import Data.Time.Clock.POSIX (getPOSIXTime, utcTimeToPOSIXSeconds)
+import Data.Time.Clock.POSIX (getPOSIXTime)
 import Network.Kademlia.Routing   as R
 #ifdef THREAD_DEBUG
 import Control.Concurrent.Lifted.Instrument
@@ -27,27 +26,16 @@ import GHC.Conc                  (labelThread)
 #endif
 import Control.Concurrent.STM
 import Control.Monad
-import Data.Bits
 import Data.Hashable
-#if MIN_VERSION_iproute(1,7,4)
-import Data.IP hiding (fromSockAddr)
-#else
-import Data.IP
-#endif
-import Data.Monoid
-import Data.Serialize                 (Serialize)
 import Data.Time.Clock.POSIX          (POSIXTime)
 import Data.Ord
 import System.Entropy
 import System.Timeout
-import Text.PrettyPrint               as PP hiding (($$), (<>))
-import Text.PrettyPrint.HughesPJClass hiding (($$), (<>))
-import System.IO
 import DPut
 
 import qualified Data.Wrapper.PSQInt  as Int
          ;import Data.Wrapper.PSQInt  (pattern (:->))
-import Network.Address                (bucketRange,genBucketSample)
+import Network.Address                (bucketRange)
 import Network.Kademlia.Search
 import Control.Concurrent.Tasks
 import Network.Kademlia
diff --git a/src/Network/Kademlia/Search.hs b/src/Network/Kademlia/Search.hs
index 29a8fc61..e13e0742 100644
--- a/src/Network/Kademlia/Search.hs
+++ b/src/Network/Kademlia/Search.hs
@@ -8,25 +8,18 @@ module Network.Kademlia.Search where
 
 import Control.Concurrent.Tasks
 import Control.Concurrent.STM
-import Control.Exception
 import Control.Monad
-import Data.Bool
 import Data.Function
-import Data.List
-import qualified Data.Map.Strict     as Map
-         ;import Data.Map.Strict     (Map)
 import Data.Maybe
 import qualified Data.Set            as Set
          ;import Data.Set            (Set)
 import Data.Hashable                 (Hashable(..)) -- for type sigs
-import System.IO
 import System.IO.Error
 
 import qualified Data.MinMaxPSQ   as MM
          ;import Data.MinMaxPSQ   (MinMaxPSQ, MinMaxPSQ')
 import qualified Data.Wrapper.PSQ as PSQ
-         ;import Data.Wrapper.PSQ (pattern (:->), Binding, pattern Binding, Binding', PSQ, PSQKey)
-import Network.Address hiding (NodeId)
+         ;import Data.Wrapper.PSQ (pattern (:->), Binding, pattern Binding, Binding', PSQKey)
 import Network.Kademlia.Routing as R
 #ifdef THREAD_DEBUG
 import Control.Concurrent.Lifted.Instrument
diff --git a/src/Network/StreamServer.hs b/src/Network/StreamServer.hs
index 01680b77..2734f0cd 100644
--- a/src/Network/StreamServer.hs
+++ b/src/Network/StreamServer.hs
@@ -15,21 +15,9 @@ module Network.StreamServer
 
 import Data.Monoid
 import Network.Socket as Socket
-import Data.ByteString.Char8
-    ( hGetNonBlocking
-    )
-import qualified Data.ByteString.Char8 as S
-    ( hPutStrLn
-    )
 import System.Directory (removeFile)
 import System.IO
     ( IOMode(..)
-    , hSetBuffering
-    , BufferMode(..)
-    , hWaitForInput
-    , hClose
-    , hIsEOF
-    , hPutStrLn
     , stderr
     , hFlush
     )
@@ -45,14 +33,12 @@ import Control.Concurrent
            ( forkIO, threadDelay, ThreadId, mkWeakThreadId, myThreadId
            , killThread )
 #endif
-import Control.Exception (catch,handle,try,finally)
+import Control.Exception (handle,finally)
 import System.IO.Error (tryIOError)
 import System.Mem.Weak
 import System.IO.Error
 
 -- import Data.Conduit
-import Control.Monad.IO.Class (MonadIO (liftIO))
-import qualified Data.ByteString as S (ByteString)
 import System.IO (Handle)
 import Control.Concurrent.MVar (newMVar)
 
diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index fcfa872f..f7cf7b1e 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -17,10 +17,6 @@
 {-# LANGUAGE ViewPatterns               #-}
 module Network.Tox where
 
-import Debug.Trace
-import Control.Exception hiding (Handler)
-import Control.Applicative
-import Control.Arrow
 #ifdef THREAD_DEBUG
 import Control.Concurrent.Lifted.Instrument
 #else
@@ -28,79 +24,27 @@ import Control.Concurrent.Lifted
 #endif
 import Control.Concurrent.STM
 import Control.Monad
-import Control.Monad.Fix
-import qualified Crypto.Cipher.ChaChaPoly1305 as Symmetric
-import qualified Crypto.Cipher.Salsa          as Salsa
-import qualified Crypto.Cipher.XSalsa         as XSalsa
-import qualified Crypto.Error                 as Cryptonite
-#ifdef CRYPTONITE_BACKPORT
-import Crypto.ECC.Class
-import Crypto.Error.Types
-#else
-import Crypto.ECC
-import Crypto.Error
-#endif
-import qualified Crypto.MAC.Poly1305          as Poly1305
 import Crypto.PubKey.Curve25519
-import Crypto.PubKey.ECC.Types
 import Crypto.Random
-import qualified Data.Aeson                   as JSON
-         ;import Data.Aeson                   (FromJSON, ToJSON, (.=))
-import Data.Bitraversable                     (bisequence)
-import Data.Bits
 import Data.Bits.ByteString                   ()
-import Data.Bool
-import qualified Data.ByteArray               as BA
-         ;import Data.ByteArray               (ByteArrayAccess, Bytes)
 import qualified Data.ByteString              as B
          ;import Data.ByteString              (ByteString)
-import qualified Data.ByteString.Base16       as Base16
 import qualified Data.ByteString.Char8        as C8
-import Data.ByteString.Lazy                   (toStrict)
-import Data.Char
-import Data.Conduit (Source,Sink,Flush(..))
 import Data.Data
 import Data.Functor.Contravariant
-import Data.Hashable
-#if MIN_VERSION_iproute(1,7,4)
-import Data.IP hiding (fromSockAddr)
-#else
-import Data.IP
-#endif
 import Data.Maybe
 import qualified Data.MinMaxPSQ               as MinMaxPSQ
-         ;import Data.MinMaxPSQ               (MinMaxPSQ')
-import Data.Monoid
-import Data.Ord
 import qualified Data.Serialize               as S
-import Data.Time.Clock.POSIX                  (POSIXTime, getPOSIXTime)
-import Data.Typeable
+import Data.Time.Clock.POSIX                  (getPOSIXTime)
 import Data.Word
 import qualified Data.Wrapper.PSQ             as PSQ
-         ;import Data.Wrapper.PSQ             (PSQ)
-import qualified Data.Wrapper.PSQInt          as Int
-import Foreign.Marshal.Alloc
-import Foreign.Ptr
-import Foreign.Storable
-import GHC.Generics                           (Generic)
 import System.Global6
-import Network.Kademlia
-import Network.Address                        (Address, WantIP (..), either4or6,
-                                               fromSockAddr, ipFamily, setPort,
-                                               sockAddrPort, testIdBit,
-                                               toSockAddr, un4map)
-import Network.Kademlia.Search          (Search (..))
+import Network.Address                        (WantIP (..))
 import qualified Network.Kademlia.Routing          as R
 import Network.QueryResponse
 import Network.Socket
 import System.Endian
-import System.IO
-import qualified Text.ParserCombinators.ReadP as RP
-import Text.Printf
-import Text.Read
-import Control.TriadCommittee
 import Network.BitTorrent.DHT.Token           as Token
-import GHC.TypeLits
 
 import Connection
 import Connection.Tox
@@ -108,7 +52,7 @@ import Crypto.Tox
 import Data.Word64Map                        (fitsInInt)
 import qualified Data.Word64Map              (empty)
 import Network.Kademlia.Bootstrap            (forkPollForRefresh, bootstrap)
-import Network.Tox.Crypto.Transport          (CryptoMessage, HandshakeData(..), Handshake(..),CryptoPacket)
+import Network.Tox.Crypto.Transport          (Handshake(..),CryptoPacket)
 import Network.Tox.Handshake
 import Network.Tox.Crypto.Handlers
 import qualified Network.Tox.DHT.Handlers    as DHT
@@ -121,7 +65,6 @@ import OnionRouter
 import Network.Tox.ContactInfo
 import Text.XXD
 import qualified Data.HashMap.Strict as HashMap
-import Data.HashMap.Strict (HashMap)
 import qualified Data.Map.Strict as Map
 import DPut
 import Network.Tox.Avahi
diff --git a/src/Network/Tox/Avahi.hs b/src/Network/Tox/Avahi.hs
index ed52de74..7fe87db2 100644
--- a/src/Network/Tox/Avahi.hs
+++ b/src/Network/Tox/Avahi.hs
@@ -7,10 +7,8 @@ module Network.Tox.Avahi
   ) where
 
 import           Data.Foldable
-import           GHC.Word           (Word16)
 import           Network.Address
 import           Network.Avahi
-import           Network.Socket
 import           Network.Tox.NodeId
 import           Text.Read
 
diff --git a/src/Network/Tox/ContactInfo.hs b/src/Network/Tox/ContactInfo.hs
index e76e2f1b..3f794197 100644
--- a/src/Network/Tox/ContactInfo.hs
+++ b/src/Network/Tox/ContactInfo.hs
@@ -1,7 +1,6 @@
 {-# LANGUAGE NamedFieldPuns #-}
 module Network.Tox.ContactInfo where
 
-import ConnectionKey
 import Connection
 
 import Data.Time.Clock.POSIX
@@ -11,13 +10,10 @@ import Crypto.PubKey.Curve25519
 import qualified Data.HashMap.Strict as HashMap
          ;import Data.HashMap.Strict (HashMap)
 import Data.Maybe
-import qualified Data.Set            as Set
-         ;import Data.Set            (Set)
 import Network.Socket
 import Network.Tox.DHT.Transport     as DHT
 import Network.Tox.NodeId            (id2key)
 import Network.Tox.Onion.Transport   as Onion
-import System.IO
 import DPut
 
 newtype ContactInfo extra = ContactInfo
diff --git a/src/Network/Tox/Crypto/Handlers.hs b/src/Network/Tox/Crypto/Handlers.hs
index 73e5f686..282a7dce 100644
--- a/src/Network/Tox/Crypto/Handlers.hs
+++ b/src/Network/Tox/Crypto/Handlers.hs
@@ -9,20 +9,16 @@ module Network.Tox.Crypto.Handlers where
 
 import Network.Tox.NodeId
 import Network.Tox.Crypto.Transport
-import Network.Tox.DHT.Transport (Cookie(..),CookieData(..), CookieRequest(..), NoSpam(..))
-import Network.Tox.DHT.Handlers (Client, cookieRequest, createCookieSTM )
+import Network.Tox.DHT.Transport (Cookie(..), NoSpam(..))
 import Crypto.Tox
 import Control.Arrow
 import Control.Concurrent.STM
 import Control.Concurrent.STM.TMChan
 import Network.Address
 import qualified Data.Map.Strict as Map
-import Crypto.Hash
-import Control.Applicative
 import Control.Monad
 import Data.Time.Clock.POSIX
 import qualified Data.ByteString  as B
-import System.IO
 import Data.ByteString (ByteString)
 import Control.Lens
 import Data.Function
@@ -39,10 +35,8 @@ import qualified Data.Set         as Set
 import qualified Data.Array.Unboxed as A
 import SensibleDir
 import System.FilePath
-import System.IO.Temp
 import System.Environment
 import System.Directory
-import System.Random -- for ping fuzz
 #ifdef THREAD_DEBUG
 import Control.Concurrent.Lifted.Instrument
 #else
@@ -54,11 +48,9 @@ import qualified Data.IntMap.Strict as IntMap
 import Control.Concurrent.Supply
 import Data.InOrOut
 import DPut
-import Debug.Trace
 import Text.Printf
 import Data.Bool
 import Connection (Status(..), Policy(..))
-import Network.Tox.ContactInfo
 import Network.Tox.Handshake
 
 -- | This type indicates the progress of a tox encrypted friend link
diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index 6c29e958..09d6f66b 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -14,7 +14,7 @@ import Network.Kademlia.Search
 import qualified Data.Wrapper.PSQInt as Int
 import Network.Kademlia
 import Network.Kademlia.Bootstrap
-import Network.Address               (WantIP (..), ipFamily, testIdBit,fromSockAddr, sockAddrPort)
+import Network.Address               (WantIP (..), ipFamily, fromSockAddr, sockAddrPort)
 import qualified Network.Kademlia.Routing as R
 import Control.TriadCommittee
 import System.Global6
@@ -29,7 +29,6 @@ import Control.Concurrent.Lifted.Instrument
 import Control.Concurrent.STM
 import Data.Time.Clock.POSIX  (POSIXTime, getPOSIXTime)
 import Network.Socket
-import Data.Hashable
 import qualified Data.HashMap.Strict as HashMap
          ;import Data.HashMap.Strict (HashMap)
 #if MIN_VERSION_iproute(1,7,4)
@@ -37,13 +36,9 @@ import Data.IP hiding (fromSockAddr)
 #else
 import Data.IP
 #endif
-import Data.Ord
 import Data.Maybe
-import Data.Bits
 import Data.Serialize (Serialize)
 import Data.Word
-import Data.List
-import System.IO
 import DPut
 
 data TransactionId = TransactionId
diff --git a/src/Network/Tox/DHT/Transport.hs b/src/Network/Tox/DHT/Transport.hs
index 9ff1839c..c6fe121c 100644
--- a/src/Network/Tox/DHT/Transport.hs
+++ b/src/Network/Tox/DHT/Transport.hs
@@ -21,7 +21,6 @@ module Network.Tox.DHT.Transport
     , DHTPublicKey(..)
     , FriendRequest(..)
     , NoSpam(..)
-    , verifyChecksum
     , CookieRequest(..)
     , CookieResponse(..)
     , Cookie(..)
@@ -45,7 +44,6 @@ import Control.Arrow
 import Control.Concurrent.STM
 import Control.Monad
 import Data.Bool
-import qualified Data.ByteString.Char8  as B8
 import qualified Data.ByteString  as B
          ;import Data.ByteString  (ByteString)
 import Data.Functor.Contravariant
@@ -54,11 +52,7 @@ import Data.Monoid
 import Data.Serialize             as S
 import Data.Tuple
 import Data.Word
-import Foreign.C (CTime(..))
 import Network.Socket
-import qualified Data.ByteString.Base64 as Base64
-import qualified Data.ByteString.Base16 as Base16
-import Data.Char (isSpace)
 
 type DHTTransport = Transport String NodeInfo (DHTMessage Encrypted8)
 type HandleHi a = Maybe (Either String (DHTMessage Encrypted8, NodeInfo)) -> IO a
diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index 2f836b8e..f9cf22a8 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -35,7 +35,6 @@ module Network.Tox.NodeId
     , nospam16
     , verifyChecksum) where
 
-import Debug.Trace
 import Control.Applicative
 import Control.Arrow
 import Control.Monad
@@ -83,7 +82,6 @@ import System.Endian
 import qualified Data.Text as Text
          ;import Data.Text (Text)
 import Util (splitJID)
-import Text.Printf
 
 -- | perform io for hashes that do allocation and ffi.
 -- unsafeDupablePerformIO is used when possible as the
diff --git a/src/Network/Tox/Onion/Handlers.hs b/src/Network/Tox/Onion/Handlers.hs
index f497a1bf..80a6ae3a 100644
--- a/src/Network/Tox/Onion/Handlers.hs
+++ b/src/Network/Tox/Onion/Handlers.hs
@@ -12,23 +12,9 @@ import qualified Network.QueryResponse as QR (Client)
 import Crypto.Tox
 import qualified Data.Wrapper.PSQ             as PSQ
          ;import Data.Wrapper.PSQ             (PSQ,pattern (:->))
-#ifdef CRYPTONITE_BACKPORT
-import Crypto.Error.Types                     (CryptoFailable (..),
-                                               throwCryptoError)
-#else
-import Crypto.Error
-#endif
 import Control.Arrow
 
-import System.IO
-import qualified Data.ByteArray               as BA
 import Data.Function
-import Data.Serialize as S
-import qualified Data.Wrapper.PSQInt as Int
-import Network.Kademlia
-import Network.Address               (WantIP (..), ipFamily, testIdBit)
-import qualified Network.Kademlia.Routing as R
-import Control.TriadCommittee
 import qualified Data.MinMaxPSQ               as MinMaxPSQ
          ;import Data.MinMaxPSQ               (MinMaxPSQ')
 import Network.BitTorrent.DHT.Token           as Token
@@ -50,8 +36,6 @@ import Data.IP hiding (fromSockAddr)
 import Data.IP
 #endif
 import Data.Maybe
-import Data.Bits
-import Data.Ord
 import Data.Functor.Identity
 import DPut
 
diff --git a/src/Network/Tox/Onion/Transport.hs b/src/Network/Tox/Onion/Transport.hs
index 70714465..e2e136ae 100644
--- a/src/Network/Tox/Onion/Transport.hs
+++ b/src/Network/Tox/Onion/Transport.hs
@@ -62,7 +62,6 @@ import Control.Concurrent.STM
 import Control.Monad
 import qualified Data.ByteString    as B
          ;import Data.ByteString    (ByteString)
-import Data.Coerce
 import Data.Function
 import Data.Functor.Contravariant
 import Data.Functor.Identity
@@ -77,11 +76,9 @@ import Data.Serialize               as S
 import Data.Type.Equality
 import Data.Typeable
 import Data.Word
-import Debug.Trace
 import GHC.Generics                 ()
 import GHC.TypeLits
 import Network.Socket
-import System.IO
 import qualified Text.ParserCombinators.ReadP as RP
 import Data.Hashable
 import DPut
diff --git a/src/Network/Tox/Transport.hs b/src/Network/Tox/Transport.hs
index 57f07aad..0b03ed19 100644
--- a/src/Network/Tox/Transport.hs
+++ b/src/Network/Tox/Transport.hs
@@ -8,7 +8,6 @@
 {-# LANGUAGE TypeOperators              #-}
 module Network.Tox.Transport (toxTransport, RouteId) where
 
-import Data.ByteString (ByteString)
 import Network.QueryResponse
 import Crypto.Tox
 import Network.Tox.DHT.Transport
diff --git a/src/Network/UPNP.hs b/src/Network/UPNP.hs
index f053369f..e89471c2 100644
--- a/src/Network/UPNP.hs
+++ b/src/Network/UPNP.hs
@@ -4,7 +4,6 @@ import Data.Maybe
 import Network.Address (sockAddrPort)
 import Network.Socket
 import System.Directory
-import System.IO
 import System.Process  as Process
 import DPut
 
diff --git a/src/System/Global6.hs b/src/System/Global6.hs
index f9073482..38a90a59 100644
--- a/src/System/Global6.hs
+++ b/src/System/Global6.hs
@@ -10,10 +10,8 @@ import Data.IP
 #endif
 import Data.List
 import Data.Maybe
-import Network.Socket
 import System.Process
 import Text.Read
-import System.IO
 
 parseIpAddr :: String -> Maybe IPv6
 parseIpAddr s = do
@@ -33,6 +31,8 @@ global6 = do
     addrs <- lines <$> readProcess "ip" ["-o","-6","addr"] ""
     return $ foldr1 mplus $ map parseIpAddr addrs
 
+
+everyOther :: [a] -> [a]
 everyOther (x:_:xs) = x : everyOther xs
 everyOther xs       = xs
 
diff --git a/src/Text/XXD.hs b/src/Text/XXD.hs
index b73a1ea2..77606bfa 100644
--- a/src/Text/XXD.hs
+++ b/src/Text/XXD.hs
@@ -2,15 +2,11 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 module Text.XXD (xxd, xxd2) where
 
-import qualified Data.ByteString.Base16 as Base16
-import Data.ByteString (ByteString)
-import qualified Data.ByteString as B
-import Data.ByteArray (ByteArrayAccess,ByteArray)
+import Data.ByteArray (ByteArrayAccess)
 import qualified Data.ByteArray as BA
 import Data.Word
 import Data.Bits
 import Data.Char
-import Data.List
 import Text.Printf
 
 nibble :: Word8 -> Char