2 files changed, 1 insertions, 13 deletions

diff --git a/src/Network/BitTorrent/Exchange.hs b/src/Network/BitTorrent/Exchange.hs
index 0fd1d15a..75bd4bfd 100644
--- a/src/Network/BitTorrent/Exchange.hs
+++ b/src/Network/BitTorrent/Exchange.hs
@@ -6,11 +6,9 @@
 --   Portability :  portable
 --
 {-# LANGUAGE OverloadedStrings          #-}
-{-# LANGUAGE DoAndIfThenElse            #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE MultiParamTypeClasses      #-}
 {-# LANGUAGE RecordWildCards            #-}
-{-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE BangPatterns               #-}
 module Network.BitTorrent.Exchange
        ( -- * Block
@@ -34,7 +32,6 @@ import Control.Applicative
 import Control.Exception
 import Control.Concurrent
 import Control.Lens
-import Control.Monad.Fork.Class
 import Control.Monad.Reader
 import Control.Monad.State
 import Control.Monad.Trans.Resource
@@ -111,8 +108,6 @@ instance MonadState SessionState P2P where
   put !s = asks sessionState >>= \ref -> liftIO $ writeIORef ref s
   {-# INLINE put #-}
 
--- TODO instance for MonadFork
-
 runSession :: SwarmSession -> PeerAddr -> P2P () -> IO ()
 runSession  se addr p2p =
     handle isIOException $
diff --git a/src/Network/BitTorrent/Internal.hs b/src/Network/BitTorrent/Internal.hs
index 5ac58d46..f163cadb 100644
--- a/src/Network/BitTorrent/Internal.hs
+++ b/src/Network/BitTorrent/Internal.hs
@@ -14,15 +14,9 @@
 --   data should be modified through standalone functions.
 --
 {-# LANGUAGE OverloadedStrings     #-}
-{-# LANGUAGE BangPatterns          #-}
 {-# LANGUAGE RecordWildCards       #-}
 {-# LANGUAGE TemplateHaskell       #-}
 {-# LANGUAGE DeriveDataTypeable    #-}
-{-# LANGUAGE FlexibleInstances     #-}
-{-# LANGUAGE FlexibleContexts      #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE UndecidableInstances  #-}
-{-# LANGUAGE ConstraintKinds       #-}
 module Network.BitTorrent.Internal
        ( Progress(..), startProgress
 
@@ -79,9 +73,8 @@ import Control.Concurrent
 import Control.Concurrent.STM
 import Control.Concurrent.MSem as MSem
 import Control.Lens
-import Control.Monad.State
-import Control.Monad.Reader
 import Control.Exception
+import Control.Monad.Trans
 
 import Data.IORef
 import Data.Default