diff --git a/gst/goom2k1/gstgoom.c b/gst/goom2k1/gstgoom.c
index 90c2dc9944..b22c8a7389 100644
--- a/gst/goom2k1/gstgoom.c
+++ b/gst/goom2k1/gstgoom.c
@@ -120,11 +120,7 @@ gst_goom_init (GstGoom * goom)
 {
   goom->width = DEFAULT_WIDTH;
   goom->height = DEFAULT_HEIGHT;
-  goom->fps_n = DEFAULT_FPS_N;  /* desired frame rate */
-  goom->fps_d = DEFAULT_FPS_D;  /* desired frame rate */
   goom->channels = 0;
-  goom->rate = 0;
-  goom->duration = 0;
 
   goom_init (&(goom->goomdata), goom->width, goom->height);
 }
@@ -158,6 +154,7 @@ gst_goom_render (GstAudioVisualizer * base, GstBuffer * audio,
 {
   GstGoom *goom = GST_GOOM (base);
   GstMapInfo amap;
+  gint16 datain[2][GOOM_SAMPLES];
   gint16 *adata;
   gint i;
 
@@ -167,17 +164,17 @@ gst_goom_render (GstAudioVisualizer * base, GstBuffer * audio,
 
   if (goom->channels == 2) {
     for (i = 0; i < GOOM_SAMPLES; i++) {
-      goom->datain[0][i] = *adata++;
-      goom->datain[1][i] = *adata++;
+      datain[0][i] = *adata++;
+      datain[1][i] = *adata++;
     }
   } else {
     for (i = 0; i < GOOM_SAMPLES; i++) {
-      goom->datain[0][i] = *adata;
-      goom->datain[1][i] = *adata++;
+      datain[0][i] = *adata;
+      datain[1][i] = *adata++;
     }
   }
 
-  video->data[0] = goom_update (&(goom->goomdata), goom->datain);
+  video->data[0] = goom_update (&(goom->goomdata), datain);
   gst_buffer_unmap (audio, &amap);
 
   return TRUE;
diff --git a/gst/goom2k1/gstgoom.h b/gst/goom2k1/gstgoom.h
index 92210b892f..7047517a32 100644
--- a/gst/goom2k1/gstgoom.h
+++ b/gst/goom2k1/gstgoom.h
@@ -43,29 +43,14 @@ struct _GstGoom
   GstAudioVisualizer parent;
 
   /* input tracking */
-  gint rate;
   gint channels;
-  guint bps;
 
   /* video state */
-  gint fps_n;
-  gint fps_d;
   gint width;
   gint height;
-  GstClockTime duration;
-  guint outsize;
-  GstBufferPool *pool;
-
-  guint dropped;        /* frames dropped / not dropped */
-  guint processed;
 
   /* goom stuff */
-  gint16 datain[2][GOOM_SAMPLES];
   GoomData goomdata;
-
-  /* QoS stuff *//* with LOCK */
-  gdouble proportion;
-  GstClockTime earliest_time;
 };
 
 struct _GstGoomClass