diff --git a/Control/Comonad/Discont.hs b/Control/Comonad/Discont.hs
deleted file mode 100644
--- a/Control/Comonad/Discont.hs
+++ /dev/null
@@ -1,15 +0,0 @@
------------------------------------------------------------------------------
--- |
--- Module      :  Control.Comonad.Discont
--- Copyright   :  (C) 2008-2011 Edward Kmett
--- License     :  BSD-style (see the file LICENSE)
---
--- Maintainer  :  Edward Kmett <ekmett@gmail.com>
--- Stability   :  experimental
--- Portability :  non-portable (fundeps, MPTCs)
-----------------------------------------------------------------------------
-module Control.Comonad.Discont ( 
-  module Control.Comonad.Discont.Lazy
-  ) where
-
-import Control.Comonad.Discont.Lazy
diff --git a/Control/Comonad/Discont/Class.hs b/Control/Comonad/Discont/Class.hs
deleted file mode 100644
--- a/Control/Comonad/Discont/Class.hs
+++ /dev/null
@@ -1,32 +0,0 @@
-{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances, UndecidableInstances #-}
------------------------------------------------------------------------------
--- |
--- Module      :  Control.Comonad.Discont.Class
--- Copyright   :  (C) 2008-2011 Edward Kmett
--- License     :  BSD-style (see the file LICENSE)
---
--- Maintainer  :  Edward Kmett <ekmett@gmail.com>
--- Stability   :  experimental
--- Portability :  non-portable (fundeps, MPTCs)
-----------------------------------------------------------------------------
-module Control.Comonad.Discont.Class 
-  ( ComonadDiscont(..)
-  ) where
-
-import Control.Comonad
-import qualified Control.Comonad.Trans.Discont.Strict as Strict
-import qualified Control.Comonad.Trans.Discont.Lazy as Lazy
-import qualified Control.Comonad.Trans.Discont.Memo as Memo
-
-class Comonad w => ComonadDiscont s w | w -> s where
-  callCV :: w (w (w a -> a) -> b) -> b
-
-instance ComonadDiscont s w => ComonadDiscont s (Lazy.DiscontT k w) where
-  callCV = Lazy.callCV
-
-instance ComonadDiscont s w => ComonadDiscont s (Memo.DiscontT k w) where
-  callCV = Memo.callCV
-
-instance ComonadDiscont s w => ComonadDiscont s (Strict.DiscontT k w) where
-  callCV = Strict.callCV
-
diff --git a/Control/Comonad/Discont/Lazy.hs b/Control/Comonad/Discont/Lazy.hs
deleted file mode 100644
--- a/Control/Comonad/Discont/Lazy.hs
+++ /dev/null
@@ -1,30 +0,0 @@
------------------------------------------------------------------------------
--- |
--- Module      :  Control.Comonad.Discont.Lazy
--- Copyright   :  (C) 2008-2011 Edward Kmett
--- License     :  BSD-style (see the file LICENSE)
---
--- Maintainer  :  Edward Kmett <ekmett@gmail.com>
--- Stability   :  experimental
--- Portability :  non-portable (fundeps, MPTCs)
-----------------------------------------------------------------------------
-module Control.Comonad.Discont.Lazy ( 
-  -- * ComonadDiscont class
-    ComonadDiscont(..)
-  , label
-  -- * The Discont comonad
-  , Discont
-  , discont
-  , runDiscont
-  -- * The DiscontT comonad transformer
-  , DiscontT(..)
-  , runDiscontT
-  -- * Re-exported modules
-  , module Control.Comonad
-  , module Control.Comonad.Trans.Class
-  ) where
-
-import Control.Comonad
-import Control.Comonad.Discont.Class (ComonadDiscont(..))
-import Control.Comonad.Trans.Class
-import Control.Comonad.Trans.Discont.Lazy (Discont, discont, runDiscont, DiscontT(..), runDiscontT, label)
diff --git a/Control/Comonad/Discont/Memo.hs b/Control/Comonad/Discont/Memo.hs
deleted file mode 100644
--- a/Control/Comonad/Discont/Memo.hs
+++ /dev/null
@@ -1,31 +0,0 @@
-----------------------------------------------------------------------------
--- |
--- Module      :  Control.Comonad.Discont.Memo
--- Copyright   :  (C) 2008-2011 Edward Kmett
--- License     :  BSD-style (see the file LICENSE)
---
--- Maintainer  :  Edward Kmett <ekmett@gmail.com>
--- Stability   :  experimental
--- Portability :  non-portable (fundeps, MPTCs)
-----------------------------------------------------------------------------
-module Control.Comonad.Discont.Memo ( 
-  -- * ComonadDiscont class
-    ComonadDiscont(..)
-  , label
-  -- * The Discont comonad
-  , Discont
-  , discont
-  , runDiscont
-  -- * The DiscontT comonad transformer
-  , DiscontT
-  , discontT
-  , runDiscontT
-  -- * Re-exported modules
-  , module Control.Comonad
-  , module Control.Comonad.Trans.Class
-  ) where
-
-import Control.Comonad
-import Control.Comonad.Discont.Class (ComonadDiscont(..))
-import Control.Comonad.Trans.Class
-import Control.Comonad.Trans.Discont.Memo (Discont, discont, runDiscont, DiscontT, discontT, runDiscontT, label)
diff --git a/Control/Comonad/Discont/Strict.hs b/Control/Comonad/Discont/Strict.hs
deleted file mode 100644
--- a/Control/Comonad/Discont/Strict.hs
+++ /dev/null
@@ -1,30 +0,0 @@
------------------------------------------------------------------------------
--- |
--- Module      :  Control.Comonad.Discont.Strict
--- Copyright   :  (C) 2008-2011 Edward Kmett
--- License     :  BSD-style (see the file LICENSE)
---
--- Maintainer  :  Edward Kmett <ekmett@gmail.com>
--- Stability   :  experimental
--- Portability :  non-portable (fundeps, MPTCs)
-----------------------------------------------------------------------------
-module Control.Comonad.Discont.Strict ( 
-  -- * ComonadDiscont class
-    ComonadDiscont(..)
-  , label
-  -- * The Discont comonad
-  , Discont
-  , discont
-  , runDiscont
-  -- * The DiscontT comonad transformer
-  , DiscontT(..)
-  , runDiscontT
-  -- * Re-exported modules
-  , module Control.Comonad
-  , module Control.Comonad.Trans.Class
-  ) where
-
-import Control.Comonad
-import Control.Comonad.Discont.Class (ComonadDiscont(..))
-import Control.Comonad.Trans.Class
-import Control.Comonad.Trans.Discont.Strict (Discont, discont, runDiscont, DiscontT(..), runDiscontT, label)
diff --git a/comonads-fd.cabal b/comonads-fd.cabal
--- a/comonads-fd.cabal
+++ b/comonads-fd.cabal
@@ -1,6 +1,6 @@
 name:          comonads-fd
 category:      Control, Comonads
-version:       1.8.0.3
+version:       2.0
 license:       BSD3
 cabal-version: >= 1.6
 license-file:  LICENSE
@@ -27,16 +27,11 @@
     base >= 4 && < 5,
     transformers >= 0.2 && < 0.3,
     mtl >= 2.0.1.0 && <= 2.1,
-    semigroups >= 0.6 && < 0.7,
-    comonad >= 1.1 && < 1.2,
-    comonad-transformers >= 1.8 && < 1.9
+    semigroups >= 0.7.1 && < 0.8,
+    comonad >= 1.1.1 && < 1.2,
+    comonad-transformers >= 2.0 && < 2.1
 
   exposed-modules:
-    Control.Comonad.Discont
-    Control.Comonad.Discont.Class
-    Control.Comonad.Discont.Lazy
-    Control.Comonad.Discont.Memo
-    Control.Comonad.Discont.Strict
     Control.Comonad.Env
     Control.Comonad.Env.Class
     Control.Comonad.Env.Strict