diff --git a/Happstack/Server/CookieFixer.hs b/Happstack/Server/CookieFixer.hs
deleted file mode 100644
--- a/Happstack/Server/CookieFixer.hs
+++ /dev/null
@@ -1,90 +0,0 @@
-module Happstack.Server.CookieFixer 
-    ( cookieFixer
-    ) where
-
-import Happstack.Server.Cookie (Cookie(..))
-import Happstack.Server(ServerPartT(..),Request(..), getHeader,
-                       localRq)
-
-import qualified Data.ByteString.Char8 as C
-import Data.Char (chr, toLower)
-import Data.List ((\\))
-import Data.Maybe
-
-import Control.Monad.Reader
-import Control.Applicative
-import Control.Monad (MonadPlus(..), ap)
--- Hide Parsec's definitions of some Applicative functions.
-import Text.ParserCombinators.Parsec hiding (many, optional, (<|>))
-
-instance Applicative (GenParser s a) where
-    pure = return
-    (<*>) = ap
-
-instance Alternative (GenParser s a) where
-    empty = mzero
-    (<|>) = mplus
-
--- Less complete but more robust way of parsing cookies.  Note: not RFC 2068 compliant!
-parseCookies :: String -> [Cookie]
-parseCookies str = either (const []) id $ parse cookiesParser "" str
-
-parseCookiesM :: (Monad m) => String -> m [Cookie]
-parseCookiesM str = either (fail "Invalid cookie syntax!") return $ parse cookiesParser str str
-
-cookiesParser = av_pairs
-    where -- Parsers based on RFC 2109
-          av_pairs      = (:) <$> av_pair <*> many (char ';' *>  av_pair)
-          av_pair       = cookie <$> attr <*> option "" (char '=' *> value)
-          attr          = spaces *> token
-          value         = word
-          word          = incomp_token <|> quoted_string
-
-          -- Parsers based on RFC 2068
-          token         = many1 $ oneOf ((chars \\ ctl) \\ tspecials)
-          quoted_string = char '"' *> many (oneOf qdtext) <* char '"'
-
-          -- Custom parser, incompatible with RFC 2068, but very  forgiving ;)
-          incomp_token  = many1 $ oneOf ((chars \\ ctl) \\ "\";")
-
-          -- Primitives from RFC 2068
-          tspecials     = "()<>@,;:\\\"/[]?={} \t"
-          ctl           = map chr (127:[0..31])
-          chars         = map chr [0..127]
-          octet         = map chr [0..255]
-          text          = octet \\ ctl
-          qdtext        = text \\ "\""
-
-cookie key value = Cookie "" "" "" (low key) value
-{-
-simpleHTTPCookieFixer :: ToMessage a => Conf -> [ServerPartT IO a] -> IO ()
-simpleHTTPCookieFixer conf hs
-    = listen conf (\req -> runValidator (fromMaybe return (validator conf)) =<< simpleHTTP' hs (cookieFixer req))
-
-cookieFixer :: Request -> Request
-cookieFixer request = [ (cookieName c, c) | cl <- fromMaybe [] (fmap getCookies (getHeader "Cookie" (rqHeaders request))), c <- cl ]
--}
-
-cookieFixer :: (Monad m) => ServerPartT m a -> ServerPartT m a
-cookieFixer = localRq fixedCookies
-    where
-      fixedCookies request = request{rqCookies=[ (cookieName c, c) | cl <- fromMaybe [] (fmap getCookies (getHeader "Cookie" (rqHeaders request))), c <- cl ]}
-
--- | Get all cookies from the HTTP request. The cookies are ordered per RFC from
--- the most specific to the least specific. Multiple cookies with the same
--- name are allowed to exist.
-getCookies :: Monad m => C.ByteString -> m [Cookie]
-getCookies header | C.null header = return []
-                  | otherwise     = parseCookiesM (C.unpack header)
-
--- | Get the most specific cookie with the given name. Fails if there is no such
--- cookie or if the browser did not escape cookies in a proper fashion.
--- Browser support for escaping cookies properly is very diverse.
-getCookie :: Monad m => String -> C.ByteString -> m Cookie
-getCookie s h = do cs <- getCookies h
-                   case filter ((==) (low s) . cookieName) cs of
-                     [r] -> return r
-                     _   -> fail ("getCookie: " ++ show s)
-
-low :: String -> String
-low = map toLower
diff --git a/Happstack/Server/Helpers.hs b/Happstack/Server/Helpers.hs
--- a/Happstack/Server/Helpers.hs
+++ b/Happstack/Server/Helpers.hs
@@ -7,7 +7,6 @@
 import System.Environment
 import Control.Concurrent
 import System.Time
-import Happstack.Server.CookieFixer
 import Control.Monad
 
 -- run the happs server on some port
@@ -21,7 +20,7 @@
       control <- startSystemState stateProxy -- start the HAppS state system
 
       putStrLn . ( "happs state started" ++ ) =<< time
-      tid <- forkIO $ simpleHTTP' f conf (cookieFixer handler)
+      tid <- forkIO $ simpleHTTP' f conf handler
       putStrLn . ( ( "simpleHttp started on port " ++ (show . port $ conf) ++ "\n" ++
                  "shut down with ctrl-c" ) ++) =<< time
       waitForTermination
@@ -47,4 +46,3 @@
   if p rq
     then sps
     else mzero
-
diff --git a/happstack-helpers.cabal b/happstack-helpers.cabal
--- a/happstack-helpers.cabal
+++ b/happstack-helpers.cabal
@@ -1,5 +1,5 @@
 Name: happstack-helpers
-Version: 0.20
+Version: 0.21
 License: BSD3
 License-file: bsd3.txt
 Description: Functions I found I was using repeatedly when programming Happstack based web-apps. 
@@ -13,7 +13,7 @@
                  Happstack.Helpers.HtmlOutput.Common, 
                  Happstack.Helpers.HtmlOutput.Menu, 
                  Happstack.Helpers.ParseRequest,Happstack.Helpers.Redirect, 
-                 Happstack.Data.User.Password, Happstack.Server.CookieFixer, 
+                 Happstack.Data.User.Password, 
                  Happstack.Data.IxSet.Helpers
                  Happstack.Server.Helpers