diff --git a/ChangeLog b/ChangeLog
index bb8c472..782ab44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-22  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/common/gstreamer.py:
+	  Remove unused imports.
+	* morituri/image/image.py:
+	  Remove halfbaked code.
+
 2011-05-22  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/rip/cd.py:
diff --git a/morituri/common/gstreamer.py b/morituri/common/gstreamer.py
index bdac99f..eb90788 100644
--- a/morituri/common/gstreamer.py
+++ b/morituri/common/gstreamer.py
@@ -20,10 +20,6 @@
 # You should have received a copy of the GNU General Public License
 # along with morituri.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
-import struct
-import zlib
-
 import gst
 
 from morituri.common import common, task
diff --git a/morituri/image/image.py b/morituri/image/image.py
index 294695f..c42388b 100644
--- a/morituri/image/image.py
+++ b/morituri/image/image.py
@@ -294,45 +294,3 @@ class ImageEncodeTask(task.MultiSeparateTask):
             self.debug('encoding track %d', trackIndex + 1)
             index = track.indexes[1]
             add(index)
-
-class ImageJoinTask(task.Task):
-    """
-    I concatenate the decoded audio from all tracks into a single .wav
-    I can optionally offset the joint audio to compensate for a write offset.
-    """
-    
-    description = "Joining tracks"
-
-    def __init__(self, image, outfile):
-
-        self._image = image
-        cue = image.cue
-        self._tasks = []
-        self.lengths = {}
-
-        def add(index):
-            # here to avoid import gst eating our options
-            from morituri.common import encode
-
-            path = image.getRealPath(index.path)
-            assert type(path) is unicode, "%r is not unicode" % path
-            self.debug('schedule encode of %r', path)
-            root, ext = os.path.splitext(os.path.basename(path))
-            outpath = os.path.join(outdir, root + '.' + profile.extension)
-            self.debug('schedule encode to %r', outpath)
-            taskk = encode.EncodeTask(path, os.path.join(outdir,
-                root + '.' + profile.extension), profile)
-            self.addTask(taskk)
-
-        try:
-            htoa = cue.table.tracks[0].indexes[0]
-            self.debug('encoding htoa track')
-            add(htoa)
-        except (KeyError, IndexError):
-            self.debug('no htoa track')
-            pass
-
-        for trackIndex, track in enumerate(cue.table.tracks):
-            self.debug('encoding track %d', trackIndex + 1)
-            index = track.indexes[1]
-            add(index)