diff --git a/Yesod/Handler.hs b/Yesod/Handler.hs
index e10c81ad..78cd5d43 100644
--- a/Yesod/Handler.hs
+++ b/Yesod/Handler.hs
@@ -39,8 +39,9 @@ import Yesod.Rep
 import Control.Exception hiding (Handler)
 import Control.Applicative
 
-import Control.Monad.Writer
+import Control.Monad.Trans
 import Control.Monad.Attempt
+import Control.Monad (liftM, ap)
 
 import System.IO
 import Data.Object.Html
diff --git a/Yesod/Helpers/Auth.hs b/Yesod/Helpers/Auth.hs
index 60e3f319..971ded13 100644
--- a/Yesod/Helpers/Auth.hs
+++ b/Yesod/Helpers/Auth.hs
@@ -24,13 +24,11 @@ import qualified Hack
 import Web.Encodings
 import qualified Web.Authenticate.Rpxnow as Rpxnow
 import qualified Web.Authenticate.OpenId as OpenId
-import Data.Enumerable
 
 import Yesod
 import Yesod.Constants
 
 import Control.Applicative ((<$>), Applicative (..))
-import Control.Monad.Reader
 import Control.Monad.Attempt
 
 import Data.Maybe (fromMaybe)
@@ -42,17 +40,7 @@ data AuthResource =
     | OpenidForward
     | OpenidComplete
     | LoginRpxnow
-    deriving Show
-
-instance Enumerable AuthResource where
-    enumerate =
-        [ Check
-        , Logout
-        , Openid
-        , OpenidForward
-        , OpenidComplete
-        , LoginRpxnow
-        ]
+    deriving (Show, Eq, Enum, Bounded)
 
 newtype RpxnowApiKey = RpxnowApiKey String
 
diff --git a/yesod.cabal b/yesod.cabal
index be2ebd03..2abb4387 100644
--- a/yesod.cabal
+++ b/yesod.cabal
@@ -35,16 +35,13 @@ library
                      hack == 2009.10.30,
                      split >= 0.1.1 && < 0.2,
                      authenticate >= 0.4.0 && < 0.5,
-                     data-default >= 0.2 && < 0.3,
                      predicates >= 0.1 && < 0.2,
                      bytestring >= 0.9.1.4 && < 0.10,
                      web-encodings >= 0.2.0 && < 0.3,
                      data-object >= 0.2.0 && < 0.3,
                      data-object-yaml >= 0.0.0 && < 0.1,
-                     enumerable >= 0.0.3 && < 0.1,
                      directory >= 1 && < 1.1,
                      transformers >= 0.1.4.0 && < 0.2,
-                     monads-fd >= 0.0.0.1 && < 0.1,
                      control-monad-attempt >= 0.0.0 && < 0.1,
                      syb,
                      text >= 0.5 && < 0.6,