diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h
index 986c570b8..7d4e97ee6 100644
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -37,7 +37,6 @@ struct _MetaCompScreen
   GHashTable            *windows_by_xid;
   MetaWindow            *focus_window;
   Window                 output;
-  GSList                *dock_windows;
 
   /* Before we create the output window */
   XserverRegion     pending_input_region;
diff --git a/src/compositor/mutter-window.c b/src/compositor/mutter-window.c
index 3a950674c..5c3261d5c 100644
--- a/src/compositor/mutter-window.c
+++ b/src/compositor/mutter-window.c
@@ -400,12 +400,6 @@ mutter_window_dispose (GObject *object)
       priv->damage = None;
     }
 
-  /*
-   * Check we are not in the dock list -- FIXME (do this in a cleaner way)
-   */
-  if (priv->type == META_COMP_WINDOW_DOCK)
-    info->dock_windows = g_slist_remove (info->dock_windows, self);
-
   info->windows = g_list_remove (info->windows, (gconstpointer) self);
   g_hash_table_remove (info->windows_by_xid, (gpointer) priv->xwindow);
 
@@ -1218,12 +1212,6 @@ mutter_window_new (MetaWindow *window)
 			       CLUTTER_ACTOR (self));
   clutter_actor_hide (CLUTTER_ACTOR (self));
 
-  if (priv->type == META_COMP_WINDOW_DOCK)
-    {
-      meta_verbose ("Appending %s to dock windows\n", meta_window_get_description (window));
-      info->dock_windows = g_slist_append (info->dock_windows, self);
-    }
-
   /*
    * Add this to the list at the top of the stack before it is mapped so that
    * map_win can find it again