1 files changed, 10 insertions, 22 deletions

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