diff --git a/common b/common
index 38267abf56..6148068f23 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 38267abf56a3428093cea71429dca6a24a927547
+Subproject commit 6148068f2318e85d8e66df485342b630d8fb49ac
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 65f1b279ec..23e632ac60 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -144,10 +144,10 @@ gst_mp3parse_init (GstMPEGAudioParse *mp3parse)
   mp3parse->sinkpad = gst_pad_new_from_template(sink_temp, "sink");
   gst_element_add_pad(GST_ELEMENT(mp3parse),mp3parse->sinkpad);
 
+  gst_element_set_loop_function (GST_ELEMENT(mp3parse),gst_mp3parse_loop);
 #if 1	/* set this to one to use the old chaining code */
   gst_pad_set_chain_function(mp3parse->sinkpad,gst_mp3parse_chain);
-#else		/* else you get the new loop-based code, which isn't complete yet */
-  gst_element_set_loop_function (GST_ELEMENT(mp3parse),gst_mp3parse_loop);
+  gst_element_set_loop_function (GST_ELEMENT(mp3parse),NULL);
 #endif
 
   mp3parse->srcpad = gst_pad_new_from_template(src_temp, "src");
diff --git a/gst/mpegstream/gstmpegdemux.c b/gst/mpegstream/gstmpegdemux.c
index 15f1785178..45cb445f96 100644
--- a/gst/mpegstream/gstmpegdemux.c
+++ b/gst/mpegstream/gstmpegdemux.c
@@ -772,59 +772,6 @@ gst_mpeg_demux_parse_pes (GstMPEGParse *mpeg_parse, GstBuffer *buffer)
   return TRUE;
 }
 
-static void
-_queue_discontinuous (GstPad *pad, gpointer ign)
-{
-  /* ugh, GstBuffer cast is wrong here */
-  gst_pad_push (pad, (GstBuffer*) gst_event_new (GST_EVENT_DISCONTINUOUS));
-}
-
-static void
-_queue_eos (GstPad *pad, gpointer ign)
-{
-  /* ugh, GstBuffer cast is wrong here */
-  gst_pad_push (pad, (GstBuffer*) gst_event_new (GST_EVENT_EOS));
-}
-
-static void
-_forall_pads (GstMPEGDemux *mpeg_demux, GFunc fun, gpointer user_data)
-{
-  GstPad *pad;
-  gint i;
-
-  /* events should be refcnt'd XXX */
-
-  for (i=0;i<NUM_PRIVATE_1_PADS;i++)
-    {
-      pad = mpeg_demux->private_1_pad[i];
-      if (pad && GST_PAD_IS_CONNECTED(pad))
-	(*fun) (pad, user_data);
-    }
-  for (i=0;i<NUM_SUBTITLE_PADS;i++)
-    {
-      pad = mpeg_demux->subtitle_pad[i];
-      if (pad && GST_PAD_IS_CONNECTED(pad))
-	(*fun) (pad, user_data);
-    }
-
-  pad = mpeg_demux->private_2_pad;
-  if (pad && GST_PAD_IS_CONNECTED(pad))
-    (*fun) (pad, user_data);
-    
-  for (i=0;i<NUM_VIDEO_PADS;i++)
-    {
-      pad = mpeg_demux->video_pad[i];
-      if (pad && GST_PAD_IS_CONNECTED(pad))
-	(*fun) (pad, user_data);
-    }
-  for (i=0;i<NUM_AUDIO_PADS;i++)
-    {
-      pad = mpeg_demux->audio_pad[i];
-      if (pad && GST_PAD_IS_CONNECTED(pad))
-	(*fun) (pad, user_data);
-    }
-}
-
 static GstElementStateReturn
 gst_mpeg_demux_change_state (GstElement *element)
 { 
diff --git a/gst/mpegstream/gstrfc2250enc.c b/gst/mpegstream/gstrfc2250enc.c
index 5ad7254c02..6fa4d37af7 100644
--- a/gst/mpegstream/gstrfc2250enc.c
+++ b/gst/mpegstream/gstrfc2250enc.c
@@ -75,9 +75,6 @@ static void 	gst_rfc2250_enc_init		(GstRFC2250Enc *rfc2250_enc);
 static GstElementStateReturn
 		gst_rfc2250_enc_change_state	(GstElement *element);
 
-static gboolean	gst_rfc2250_enc_parse_packhead 	(GstRFC2250Enc *rfc2250_enc, GstBuffer *buffer);
-static void 	gst_rfc2250_enc_send_data	(GstRFC2250Enc *rfc2250_enc, GstData *data);
-
 static void 	gst_rfc2250_enc_loop 		(GstElement *element);
 
 static void 	gst_rfc2250_enc_get_property	(GObject *object, guint prop_id,