diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+0.6
+---
+
+* Cleaned the API of detritus. Use the image* functions.
+
 0.5
 ---
 
diff --git a/ffmpeg-light.cabal b/ffmpeg-light.cabal
--- a/ffmpeg-light.cabal
+++ b/ffmpeg-light.cabal
@@ -1,5 +1,5 @@
 name:                ffmpeg-light
-version:             0.5
+version:             0.6
 synopsis:            Minimal bindings to the FFmpeg library.
 
 description:         Stream frames from an encoded video, or stream frames to
diff --git a/src/Codec/FFmpeg.hs b/src/Codec/FFmpeg.hs
--- a/src/Codec/FFmpeg.hs
+++ b/src/Codec/FFmpeg.hs
@@ -4,19 +4,15 @@
 module Codec.FFmpeg (-- * Initialization
                      initFFmpeg, 
                      -- * Decoding
-                     frameReader, frameReaderT,
-                     frameReaderTime, frameReaderTimeT,
                      imageReader, imageReaderTime,
                      -- * Encoding
-                     EncodingParams(..), defaultParams,
-                     frameWriterRgb, imageWriter,
+                     EncodingParams(..), defaultParams, imageWriter,
                      -- * JuicyPixels interop
                      toJuicy, toJuicyT, saveJuicy,
                      -- * Types and Enums
                      module Codec.FFmpeg.Types, 
                      module Codec.FFmpeg.Enums
                      )where
-import Codec.FFmpeg.Decode
 import Codec.FFmpeg.Encode
 import Codec.FFmpeg.Enums
 import Codec.FFmpeg.Juicy
diff --git a/src/Codec/FFmpeg/Decode.hs b/src/Codec/FFmpeg/Decode.hs
--- a/src/Codec/FFmpeg/Decode.hs
+++ b/src/Codec/FFmpeg/Decode.hs
@@ -129,7 +129,7 @@
 read_frame_check ctx pkt = do r <- av_read_frame ctx pkt
                               when (r < 0) (errMsg "Frame read failed")
 
--- | Read RGB frames from a video stream.
+-- | Read frames of the given 'AVPixelFormat' from a video stream.
 frameReader :: (MonadIO m, Error e, MonadError e m)
             => AVPixelFormat -> FilePath -> m (IO (Maybe AVFrame), IO ())
 frameReader dstFmt fileName =
@@ -146,8 +146,9 @@
              => FilePath -> m (MaybeT IO AVFrame, IO ())
 frameReaderT = fmap (first MaybeT) . frameReader avPixFmtRgb24
 
--- | Read time stamped RGB frames from a video stream. Time is given
--- in seconds from the start of the stream.
+-- | Read time stamped frames of the given 'AVPixelFormat' from a
+-- video stream. Time is given in seconds from the start of the
+-- stream.
 frameReaderTime :: (MonadIO m, Error e, MonadError e m)
                 => AVPixelFormat -> FilePath
                 -> m (IO (Maybe (AVFrame, Double)), IO ())
diff --git a/src/Codec/FFmpeg/Juicy.hs b/src/Codec/FFmpeg/Juicy.hs
--- a/src/Codec/FFmpeg/Juicy.hs
+++ b/src/Codec/FFmpeg/Juicy.hs
@@ -99,7 +99,7 @@
 juicyPixelStride _ = 
   sizeOf (undefined :: PixelBaseComponent a) * componentCount (undefined :: a)
 
--- | Read RGB frames from a video stream.
+-- | Read frames from a video stream.
 imageReader :: forall m p e.
                (Functor m, MonadIO m, Error e, MonadError e m,
                 JuicyPixelFormat p)
@@ -108,8 +108,8 @@
             . frameReader (juicyPixelFormat ([] :: [p]))
   where aux g x = MaybeT x >>= MaybeT . g
 
--- | Read time stamped RGB frames from a video stream. Time is given
--- in seconds from the start of the stream.
+-- | Read time stamped frames from a video stream. Time is given in
+-- seconds from the start of the stream.
 imageReaderTime :: forall m p e.
                    (Functor m, MonadIO m, Error e, MonadError e m,
                     JuicyPixelFormat p)