4 files changed, 14 insertions, 26 deletions

diff --git a/Presence/ServerC.hs b/Presence/ServerC.hs
index 22104a31..02c6446e 100644
--- a/Presence/ServerC.hs
+++ b/Presence/ServerC.hs
@@ -18,8 +18,7 @@ import Data.ByteString.Char8
     ( hGetNonBlocking
     )
 import qualified Data.ByteString.Char8 as S
-    ( hPutStr
-    , hPutStrLn
+    ( hPutStrLn
     )
 import System.IO 
     ( IOMode(..)
@@ -38,7 +37,6 @@ import Data.HList.TypeCastGeneric1()
 import System.IO.Error
 
 import Data.Conduit
-import Control.Monad.Trans.Class (lift)
 import Control.Monad.IO.Class (MonadIO (liftIO))
 import qualified Data.ByteString as S (ByteString)
 import System.IO (Handle)
diff --git a/Presence/XMPP.hs b/Presence/XMPP.hs
index 37a3c5f8..e51607b2 100644
--- a/Presence/XMPP.hs
+++ b/Presence/XMPP.hs
@@ -32,11 +32,7 @@ import Network.Socket
     , SocketType(..)
     )
 import Network.BSD 
-    ( PortNumber
-    , getHostName
-    , hostName
-    , hostAliases
-    , getProtocolNumber
+    ( getProtocolNumber
     )
 import System.IO
     ( BufferMode(..)
@@ -48,16 +44,14 @@ import Data.Conduit
 import qualified Data.Conduit.List as CL
 import qualified Data.Conduit.Binary as CB
 import Data.ByteString (ByteString)
-import qualified Data.ByteString.Char8 as S (pack,putStr,putStrLn,append)
+import qualified Data.ByteString.Char8 as S (putStrLn,append)
 import qualified Data.ByteString.Lazy.Char8 as L
     ( putStrLn
     , fromChunks
-    , unlines
-    , hPutStrLn
     )
-import Control.Concurrent (forkIO,killThread)
+import Control.Concurrent (forkIO)
 import Control.Concurrent.Async
-import Control.Exception 
+import Control.Exception as E
     ( handle
     -- , SomeException(..)
     , finally
@@ -67,16 +61,13 @@ import System.IO.Error (isDoesNotExistError)
 import Control.Monad.IO.Class
 import Control.Monad.Trans.Class
 import Control.Monad.Trans.Maybe
-import Todo
-import Control.Monad as Monad
 import Text.XML.Stream.Parse (parseBytes,content)
 import Text.XML.Stream.Render
 import Data.XML.Types as XML
 import qualified Data.Text as S (takeWhile)
 import Data.Text.Encoding      as S (decodeUtf8,encodeUtf8)
-import Data.Text.Lazy.Encoding as L (decodeUtf8,encodeUtf8)
+import Data.Text.Lazy.Encoding as L (decodeUtf8)
 import Data.Text.Lazy (toStrict)
-import Data.Monoid
 import qualified Data.Sequence as Seq
 import Data.Foldable (toList)
 #ifdef RENDERFLUSH
@@ -1083,7 +1074,7 @@ toPeer sock cache chan fail = do
     let -- log     = liftIO . L.putStrLn . ("(>P) " <++>)
         send xs = yield xs >> prettyPrint ">P: " xs -- >> return (3::Int)
         checkConnection cmd = do
-            liftIO $ catch (getPeerName sock >> return ())
+            liftIO $ catchIO (getPeerName sock >> return ())
                            (\_ -> fail . Just $ cmd)
         sendOrFail getXML cmd = do
             checkConnection cmd
diff --git a/Presence/XMPPTypes.hs b/Presence/XMPPTypes.hs
index 4507f5bf..4802002c 100644
--- a/Presence/XMPPTypes.hs
+++ b/Presence/XMPPTypes.hs
@@ -3,9 +3,7 @@
 module XMPPTypes where
 
 import Network.Socket 
-    ( Socket
-    , Family(..)
-    , SockAddr(..)
+    ( Family(..)
     , getAddrInfo
     , addrCanonName
     , addrAddress
@@ -18,9 +16,11 @@ import Network.BSD
     , hostName
     , hostAliases
     )
-import System.IO (Handle)
 import Control.Concurrent.STM (TChan)
-import qualified Data.ByteString.Char8 as S (ByteString,pack,putStr,putStrLn,append)
+import qualified Data.ByteString.Char8 as S 
+    ( ByteString
+    , pack
+    )
 import Data.ByteString.Lazy.Char8 as L  
     ( ByteString
     , unpack
@@ -37,8 +37,7 @@ import Control.DeepSeq
 import ByteStringOperators
 import SocketLike
 import GetHostByAddr
-import Data.Maybe (listToMaybe,catMaybes)
-import Control.Monad.STM
+import Data.Maybe (listToMaybe)
 
 class JabberClientSession session where
     data XMPPClass session
diff --git a/Presence/main.hs b/Presence/main.hs
index 781b87fa..deab92ac 100644
--- a/Presence/main.hs
+++ b/Presence/main.hs
@@ -56,7 +56,7 @@ import           Data.ByteString.Lazy.Char8 as L (ByteString,putStrLn)
 import qualified Prelude
 import           Prelude hiding (putStrLn)
 import System.Environment
-import qualified Text.Show.ByteString as L
+-- import qualified Text.Show.ByteString as L
 import Network.Socket (Family(AF_INET,AF_INET6))
 import           Holumbus.Data.MultiMap as MM (MultiMap)
 import qualified Holumbus.Data.MultiMap as MM