6 files changed, 14 insertions, 47 deletions

diff --git a/Presence/ControlMaybe.hs b/Presence/ControlMaybe.hs
index c98a6fb9..a101d667 100644
--- a/Presence/ControlMaybe.hs
+++ b/Presence/ControlMaybe.hs
@@ -7,7 +7,6 @@ module ControlMaybe
 
 -- import GHC.IO.Exception (IOException(..))
 import Control.Monad
-import Control.Exception as Exception (IOException(..),catch)
 import Data.Functor
 import System.IO.Error
 
diff --git a/Presence/DNSCache.hs b/Presence/DNSCache.hs
index afcc227c..ce35752e 100644
--- a/Presence/DNSCache.hs
+++ b/Presence/DNSCache.hs
@@ -43,7 +43,6 @@ import Data.Function
 import Data.List
 import Data.Ord
 import Data.Maybe
-import System.IO
 import System.IO.Error
 
 import SockAddr      ()
diff --git a/Presence/PeerResolve.hs b/Presence/PeerResolve.hs
index 0854b365..900688c3 100644
--- a/Presence/PeerResolve.hs
+++ b/Presence/PeerResolve.hs
@@ -6,24 +6,12 @@ module PeerResolve
     , withPort
     ) where
 
-import Data.List       ( nub )
 import Data.Text       ( Text )
 import Network.Socket  ( SockAddr(..) )
-import System.Endian   ( fromBE32, toBE32 )
-import System.IO.Error ( isDoesNotExistError )
-import Control.Exception ( handle, ErrorCall(..) )
-import qualified Network.BSD as BSD
-import qualified Data.Text   as Text
-import Control.Concurrent
-import Control.Concurrent.STM
-import Control.Monad
-import Data.Maybe
 import System.IO.Unsafe
 
-import GetHostByAddr
 import DNSCache
 import ConnectionKey
-import ControlMaybe
 
 {-# NOINLINE global_dns_cache #-}
 global_dns_cache :: DNSCache
diff --git a/Presence/Presence.hs b/Presence/Presence.hs
index 697c1476..af6597b6 100644
--- a/Presence/Presence.hs
+++ b/Presence/Presence.hs
@@ -6,32 +6,27 @@
 module Presence where
 
 import System.Directory
-import System.Environment
 import System.IO.Error
-import System.Posix.Signals
-import Control.Concurrent (threadDelay,forkIO,forkOS,killThread,throwTo)
+#ifndef THREAD_DEBUG
+import Control.Concurrent
+#else
+import Control.Concurrent.Lifted.Instrument
+#endif
+
 import Control.Concurrent.STM
-import Control.Concurrent.STM.TMVar
 import Control.Monad.Trans
-import Control.Monad.IO.Class (MonadIO, liftIO)
-import Network.Socket ( SockAddr(..), PortNumber )
-import System.Endian (fromBE32)
+import Network.Socket ( SockAddr(..) )
 import Data.Char
 import Data.List (nub, (\\), intersect, groupBy, sort, sortBy )
 import Data.Ord (comparing )
-import Data.Monoid ( (<>), Sum(..), getSum )
+import Data.Monoid ((<>))
 import qualified Data.Text as Text
-import qualified Data.Text.IO as Text
 import qualified Data.Text.Encoding as Text
 import Control.Monad
-import Control.Monad.Fix
-import qualified Network.BSD as BSD
-import qualified Data.Text as Text
 import Data.Text (Text)
 import qualified Data.Map as Map
 import Data.Map (Map)
-import Control.Exception ({-evaluate,-}handle,SomeException(..),bracketOnError,ErrorCall(..))
-import System.IO.Error (isDoesNotExistError)
+import Control.Exception ({-evaluate,-}handle,SomeException(..))
 import System.Posix.User (getUserEntryForID,userName)
 import qualified Data.ByteString.Lazy.Char8 as L
 import qualified ConfigFiles
@@ -41,14 +36,7 @@ import Data.Int (Int8)
 import Data.XML.Types (Event)
 import System.Posix.Types (UserID,CPid)
 import Control.Applicative
-#ifdef CRYPTONITE_BACKPORT
-import Crypto.Error.Types       (CryptoFailable (..))
-#else
-import Crypto.Error
-#endif
 import Crypto.PubKey.Curve25519 (SecretKey,toPublic)
-import Text.Read (readMaybe)
-import System.IO
 
 import ControlMaybe
 import LockedChan (LockedChan)
@@ -61,7 +49,7 @@ import ConsoleWriter
 import ClientState
 import Util
 import qualified Connection
-import Network.Tox.NodeId (id2key,key2id)
+import Network.Tox.NodeId (key2id)
 import Crypto.Tox (decodeSecret)
 import DPut
 
diff --git a/Presence/SockAddr.hs b/Presence/SockAddr.hs
index 91a03870..b5fbf16e 100644
--- a/Presence/SockAddr.hs
+++ b/Presence/SockAddr.hs
@@ -2,10 +2,11 @@
 {-# LANGUAGE StandaloneDeriving #-}
 module SockAddr () where
 
-import Network.Socket ( SockAddr(..) )
-
 #if MIN_VERSION_network(2,4,0)
+import Network.Socket ()
 #else
+import Network.Socket ( SockAddr(..) )
+
 deriving instance Ord SockAddr
 #endif
 
diff --git a/Presence/XMPPServer.hs b/Presence/XMPPServer.hs
index cf7aca70..8d294698 100644
--- a/Presence/XMPPServer.hs
+++ b/Presence/XMPPServer.hs
@@ -48,10 +48,8 @@ import PeerResolve
 import qualified Connection
 import Util
 import Network.Address (getBindAddress, sockAddrPort)
-import Blaze.ByteString.Builder (Builder)
 
 import Debug.Trace
-import System.IO (hFlush,stdout)
 import Control.Monad.Trans (lift)
 import Control.Monad.IO.Class (MonadIO, liftIO)
 import Control.Monad.Fix (fix)
@@ -66,7 +64,6 @@ import Control.Concurrent.STM
 -- import Control.Concurrent.STM.TChan
 import Network.SocketLike
 import Text.Printf
-import System.Posix.Signals
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as Strict8
 -- import qualified Data.ByteString.Lazy.Char8 as Lazy8
@@ -86,21 +83,16 @@ import qualified Text.XML.Stream.Render as XML hiding (content)
 import qualified Text.XML.Stream.Parse as XML
 import Data.XML.Types as XML
 import Data.Maybe
-import Data.List (nub)
 import Data.Monoid ( (<>) )
 import Data.Text (Text)
 import qualified Data.Text as Text (pack,unpack,words,intercalate)
-import Data.Char (toUpper,chr,ord)
-import Data.Map (Map)
+import Data.Char (chr,ord)
 import qualified Data.Map as Map
 import Data.Set (Set, (\\) )
 import qualified Data.Set as Set
 import Data.String ( IsString(..) )
 import qualified System.Random
 import Data.Void (Void)
-import System.Endian (toBE32)
-import Control.Applicative
-import System.IO
 import DPut
 
 -- peerport :: PortNumber