3 files changed, 4 insertions, 11 deletions

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