diff --git a/plugins/pip/Main.vala b/plugins/pip/Main.vala
index 391331b64..1fc2cc414 100644
--- a/plugins/pip/Main.vala
+++ b/plugins/pip/Main.vala
@@ -92,7 +92,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
                 var rect = Graphene.Rect.alloc ();
                 rect.init (point_x, point_y, width, height);
 
-                var popup_window = new PopupWindow (wm, active);
+                var popup_window = new PopupWindow (wm.get_display (), active);
                 popup_window.set_container_clip (rect);
                 popup_window.show.connect (on_popup_window_show);
                 popup_window.hide.connect (on_popup_window_hide);
@@ -114,7 +114,7 @@ public class Gala.Plugins.PIP.Plugin : Gala.Plugin {
     private void select_window_at (int x, int y) {
         var selected = get_window_actor_at (x, y);
         if (selected != null) {
-            var popup_window = new PopupWindow (wm, selected);
+            var popup_window = new PopupWindow (wm.get_display (), selected);
             popup_window.show.connect (on_popup_window_show);
             popup_window.hide.connect (on_popup_window_hide);
             add_window (popup_window);
diff --git a/plugins/pip/PopupWindow.vala b/plugins/pip/PopupWindow.vala
index a3ecc73c2..f7099446b 100644
--- a/plugins/pip/PopupWindow.vala
+++ b/plugins/pip/PopupWindow.vala
@@ -16,7 +16,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 
     public signal void closed ();
 
-    public Gala.WindowManager wm { get; construct; }
+    public Meta.Display display { get; construct; }
     public Meta.WindowActor window_actor { get; construct; }
 
     private Clutter.Clone clone; // clone itself
@@ -52,12 +52,11 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
             || window_type == Meta.WindowType.MODAL_DIALOG;
     }
 
-    public PopupWindow (Gala.WindowManager wm, Meta.WindowActor window_actor) {
-        Object (wm: wm, window_actor: window_actor);
+    public PopupWindow (Meta.Display display, Meta.WindowActor window_actor) {
+        Object (display: display, window_actor: window_actor);
     }
 
     construct {
-        unowned var display = wm.get_display ();
         var scale = display.get_monitor_scale (display.get_current_monitor ());
 
         button_size = Gala.Utils.scale_to_int (36, scale);
@@ -133,7 +132,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         window.unmanaged.connect (on_close_click_clicked);
         window.notify["appears-focused"].connect (update_window_focus);
 
-        unowned var workspace_manager = wm.get_display ().get_workspace_manager ();
+        unowned var workspace_manager = display.get_workspace_manager ();
         workspace_manager.active_workspace_changed.connect (update_window_focus);
     }
 
@@ -215,7 +214,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     }
 
     private Clutter.Actor on_move_begin () {
-        wm.get_display ().set_cursor (Meta.Cursor.DND_IN_DRAG);
+        display.set_cursor (Meta.Cursor.DND_IN_DRAG);
 
         return this;
     }
@@ -223,7 +222,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     private void on_move_end () {
         reactive = true;
         update_screen_position ();
-        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
+        display.set_cursor (Meta.Cursor.DEFAULT);
     }
 
 #if HAS_MUTTER45
@@ -245,7 +244,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
         grab = resize_button.get_stage ().grab (resize_button);
         resize_button.event.connect (on_resize_event);
 
-        wm.get_display ().set_cursor (Meta.Cursor.SE_RESIZE);
+        display.set_cursor (Meta.Cursor.SE_RESIZE);
 
         return Clutter.EVENT_PROPAGATE;
     }
@@ -306,7 +305,7 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 
         update_screen_position ();
 
-        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
+        display.set_cursor (Meta.Cursor.DEFAULT);
     }
 
     private void on_allocation_changed () {
@@ -329,14 +328,14 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     }
 
     private void update_window_focus () {
-        unowned Meta.Window focus_window = wm.get_display ().get_focus_window ();
+        unowned Meta.Window focus_window = display.get_focus_window ();
         if ((focus_window != null && !get_window_is_normal (focus_window))
             || (previous_focus != null && !get_window_is_normal (previous_focus))) {
             previous_focus = focus_window;
             return;
         }
 
-        unowned var workspace_manager = wm.get_display ().get_workspace_manager ();
+        unowned var workspace_manager = display.get_workspace_manager ();
         unowned var active_workspace = workspace_manager.get_active_workspace ();
         unowned var window = window_actor.get_meta_window ();
 
@@ -520,7 +519,6 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
     }
 
     private bool coord_is_in_other_monitor (float coord, Clutter.Orientation axis) {
-        var display = wm.get_display ();
         int n_monitors = display.get_n_monitors ();
 
         if (n_monitors == 1) {
@@ -553,7 +551,6 @@ public class Gala.Plugins.PIP.PopupWindow : Clutter.Actor {
 #else
     private void get_current_monitor_rect (out Meta.Rectangle rect) {
 #endif
-        var display = wm.get_display ();
         rect = display.get_monitor_geometry (display.get_current_monitor ());
     }
 
diff --git a/src/Background/BackgroundContainer.vala b/src/Background/BackgroundContainer.vala
index 942ae6177..47731ca92 100644
--- a/src/Background/BackgroundContainer.vala
+++ b/src/Background/BackgroundContainer.vala
@@ -20,14 +20,14 @@ namespace Gala {
         public signal void changed ();
         public signal void show_background_menu (int x, int y);
 
-        public WindowManager wm { get; construct; }
+        public Meta.Display display { get; construct; }
 
-        public BackgroundContainer (WindowManager wm) {
-            Object (wm: wm);
+        public BackgroundContainer (Meta.Display display) {
+            Object (display: display);
         }
 
         construct {
-            unowned var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
+            unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
             monitor_manager.monitors_changed.connect (update);
 
             reactive = true;
@@ -44,7 +44,7 @@ namespace Gala {
         }
 
         ~BackgroundContainer () {
-            unowned var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
+            unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
             monitor_manager.monitors_changed.disconnect (update);
         }
 
@@ -59,8 +59,8 @@ namespace Gala {
 
             destroy_all_children ();
 
-            for (var i = 0; i < wm.get_display ().get_n_monitors (); i++) {
-                var background = new BackgroundManager (wm, i);
+            for (var i = 0; i < display.get_n_monitors (); i++) {
+                var background = new BackgroundManager (display, i);
 
                 add_child (background);
 
diff --git a/src/Background/BackgroundManager.vala b/src/Background/BackgroundManager.vala
index 0d384ba9e..3e0dc52ea 100644
--- a/src/Background/BackgroundManager.vala
+++ b/src/Background/BackgroundManager.vala
@@ -10,7 +10,7 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
 
     public signal void changed ();
 
-    public WindowManager wm { get; construct; }
+    public Meta.Display display { get; construct; }
     public int monitor_index { get; construct; }
     public bool control_position { get; construct; }
     public bool rounded_corners { get; construct; }
@@ -24,12 +24,12 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
     private Meta.BackgroundActor? background_actor;
     private Meta.BackgroundActor? new_background_actor = null;
 
-    public BackgroundManager (WindowManager wm, int monitor_index, bool control_position = true, bool rounded_corners = true) {
-        Object (wm: wm, monitor_index: monitor_index, control_position: control_position, rounded_corners: rounded_corners);
+    public BackgroundManager (Meta.Display display, int monitor_index, bool control_position = true, bool rounded_corners = true) {
+        Object (display: display, monitor_index: monitor_index, control_position: control_position, rounded_corners: rounded_corners);
     }
 
     construct {
-        background_source = BackgroundCache.get_default ().get_background_source (wm.get_display ());
+        background_source = BackgroundCache.get_default ().get_background_source (display);
         update_background_actor (false);
 
         destroy.connect (on_destroy);
@@ -93,7 +93,7 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
 
         if (background.is_loaded) {
             if (rounded_corners) {
-                new_content.rounded_clip_radius = Utils.scale_to_int (6, wm.get_display ().get_monitor_scale (monitor_index));
+                new_content.rounded_clip_radius = Utils.scale_to_int (6, display.get_monitor_scale (monitor_index));
             }
 
             swap_background_actor (animate);
@@ -106,7 +106,7 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
             background.set_data<ulong> ("background-loaded-handler", 0);
 
             if (rounded_corners) {
-                new_content.rounded_clip_radius = Utils.scale_to_int (6, wm.get_display ().get_monitor_scale (monitor_index));
+                new_content.rounded_clip_radius = Utils.scale_to_int (6, display.get_monitor_scale (monitor_index));
             }
 
             swap_background_actor (animate);
@@ -121,8 +121,6 @@ public class Gala.BackgroundManager : Meta.BackgroundGroup, Gala.BackgroundManag
     }
 
     private Meta.BackgroundActor create_background_actor () {
-        unowned var display = wm.get_display ();
-
         var background = background_source.get_background (monitor_index);
         var background_actor = new Meta.BackgroundActor (display, monitor_index);
 
diff --git a/src/DBus.vala b/src/DBus.vala
index 1034883b3..6f92c8ddc 100644
--- a/src/DBus.vala
+++ b/src/DBus.vala
@@ -33,7 +33,7 @@ public class Gala.DBus {
         Bus.own_name (BusType.SESSION, "org.gnome.Shell", BusNameOwnerFlags.NONE,
             (connection) => {
                 try {
-                    connection.register_object ("/org/gnome/Shell", DBusAccelerator.init (wm));
+                    connection.register_object ("/org/gnome/Shell", DBusAccelerator.init (wm.get_display ()));
                     connection.register_object ("/org/gnome/Shell/Screenshot", ScreenshotManager.init (wm));
                 } catch (Error e) { warning (e.message); }
             },
diff --git a/src/DBusAccelerator.vala b/src/DBusAccelerator.vala
index 8435af70d..cae78bb9f 100644
--- a/src/DBusAccelerator.vala
+++ b/src/DBusAccelerator.vala
@@ -75,22 +75,23 @@ namespace Gala {
         private static DBusAccelerator? instance;
 
         [DBus (visible = false)]
-        public static unowned DBusAccelerator init (WindowManager wm) {
-            if (instance == null)
-                instance = new DBusAccelerator (wm);
+        public static unowned DBusAccelerator init (Meta.Display display) {
+            if (instance == null) {
+                instance = new DBusAccelerator (display);
+            }
 
             return instance;
         }
 
         public signal void accelerator_activated (uint action, GLib.HashTable<string, Variant> parameters);
 
-        private WindowManager wm;
+        private Meta.Display display;
         private GLib.HashTable<unowned string, GrabbedAccelerator> grabbed_accelerators;
 
-        private DBusAccelerator (WindowManager _wm) {
-            wm = _wm;
+        private DBusAccelerator (Meta.Display _display) {
+            display = _display;
             grabbed_accelerators = new HashTable<unowned string, GrabbedAccelerator> (str_hash, str_equal);
-            wm.get_display ().accelerator_activated.connect (on_accelerator_activated);
+            display.accelerator_activated.connect (on_accelerator_activated);
         }
 
         private void on_accelerator_activated (uint action, Clutter.InputDevice device, uint timestamp) {
@@ -115,7 +116,7 @@ namespace Gala {
                 return found_accel.action;
             }
 
-            uint action = wm.get_display ().grab_accelerator (accelerator, grab_flags);
+            uint action = display.grab_accelerator (accelerator, grab_flags);
             if (action != Meta.KeyBindingFlags.NONE) {
                 var accel = new GrabbedAccelerator ();
                 accel.action = action;
@@ -141,7 +142,7 @@ namespace Gala {
         public bool ungrab_accelerator (uint action) throws GLib.DBusError, GLib.IOError {
             foreach (unowned GrabbedAccelerator accel in grabbed_accelerators.get_values ()) {
                 if (accel.action == action) {
-                    bool ret = wm.get_display ().ungrab_accelerator (action);
+                    bool ret = display.ungrab_accelerator (action);
                     grabbed_accelerators.remove (accel.name);
                     return ret;
                 }
diff --git a/src/ShellClients/ShellClientsManager.vala b/src/ShellClients/ShellClientsManager.vala
index 05a765fc3..757b1f08f 100644
--- a/src/ShellClients/ShellClientsManager.vala
+++ b/src/ShellClients/ShellClientsManager.vala
@@ -184,7 +184,7 @@ public class Gala.ShellClientsManager : Object {
     }
 
     public void make_centered (Meta.Window window) requires (!is_itself_positioned (window)) {
-        positioned_windows[window] = new WindowPositioner (wm, window, CENTER);
+        positioned_windows[window] = new WindowPositioner (wm.get_display (), window, CENTER);
 
         // connect_after so we make sure that any queued move is unqueued
         window.unmanaging.connect_after ((_window) => positioned_windows.remove (_window));
diff --git a/src/ShellClients/WindowPositioner.vala b/src/ShellClients/WindowPositioner.vala
index 3966d359e..62b7928d7 100644
--- a/src/ShellClients/WindowPositioner.vala
+++ b/src/ShellClients/WindowPositioner.vala
@@ -10,13 +10,13 @@ public class Gala.WindowPositioner : Object {
         CENTER
     }
 
+    public Meta.Display display { get; construct; }
     public Meta.Window window { get; construct; }
-    public WindowManager wm { get; construct; }
     public Position position { get; private set; }
     public Variant? position_data { get; private set; }
 
-    public WindowPositioner (WindowManager wm, Meta.Window window, Position position, Variant? position_data = null) {
-        Object (wm: wm, window: window, position: position, position_data: position_data);
+    public WindowPositioner (Meta.Display display, Meta.Window window, Position position, Variant? position_data = null) {
+        Object (display: display, window: window, position: position, position_data: position_data);
     }
 
     construct {
@@ -26,7 +26,7 @@ public class Gala.WindowPositioner : Object {
         window.position_changed.connect (position_window);
         window.shown.connect (position_window);
 
-        unowned var monitor_manager = wm.get_display ().get_context ().get_backend ().get_monitor_manager ();
+        unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
         monitor_manager.monitors_changed.connect (position_window);
         monitor_manager.monitors_changed_internal.connect (position_window);
     }
@@ -46,7 +46,6 @@ public class Gala.WindowPositioner : Object {
 
         switch (position) {
             case CENTER:
-                unowned var display = wm.get_display ();
                 var monitor_geom = display.get_monitor_geometry (display.get_primary_monitor ());
                 var window_rect = window.get_frame_rect ();
 
diff --git a/src/Widgets/DwellClickTimer.vala b/src/Widgets/DwellClickTimer.vala
index 393d3e5de..cf7f5afa7 100644
--- a/src/Widgets/DwellClickTimer.vala
+++ b/src/Widgets/DwellClickTimer.vala
@@ -39,12 +39,12 @@ namespace Gala {
         private GLib.Settings interface_settings;
         private Cairo.ImageSurface surface;
 
-        public weak WindowManager wm { get; construct; }
+        public Meta.Display display { get; construct; }
 
         public double angle { get; set; }
 
-        public DwellClickTimer (WindowManager wm) {
-            Object (wm: wm);
+        public DwellClickTimer (Meta.Display display) {
+            Object (display: display);
         }
 
         construct {
@@ -69,7 +69,6 @@ namespace Gala {
             seat.set_pointer_a11y_dwell_click_type (Clutter.PointerA11yDwellClickType.PRIMARY);
 
             seat.ptr_a11y_timeout_started.connect ((device, type, timeout) => {
-                unowned var display = wm.get_display ();
                 var scale = display.get_monitor_scale (display.get_current_monitor ());
                 update_cursor_size (scale);
 
diff --git a/src/Widgets/IconGroup.vala b/src/Widgets/IconGroup.vala
index 29cd48cd7..6765846f7 100644
--- a/src/Widgets/IconGroup.vala
+++ b/src/Widgets/IconGroup.vala
@@ -39,7 +39,7 @@ namespace Gala {
 
         private DragDropAction drag_action;
 
-        public WindowManager wm { get; construct; }
+        public Meta.Display display { get; construct; }
         public Meta.Workspace workspace { get; construct; }
         private float _scale_factor = 1.0f;
         public float scale_factor {
@@ -55,8 +55,8 @@ namespace Gala {
         private Clutter.Actor? prev_parent = null;
         private Clutter.Actor icon_container;
 
-        public IconGroup (WindowManager wm, Meta.Workspace workspace, float scale) {
-            Object (wm: wm, workspace: workspace, scale_factor: scale);
+        public IconGroup (Meta.Display display, Meta.Workspace workspace, float scale) {
+            Object (display: display, workspace: workspace, scale_factor: scale);
         }
 
         construct {
@@ -143,7 +143,7 @@ namespace Gala {
          *                  the group.
          */
         public void add_window (Meta.Window window, bool no_redraw = false, bool temporary = false) {
-            var new_window = new WindowIconActor (wm, window);
+            var new_window = new WindowIconActor (window);
             new_window.set_position (32, 32);
             new_window.temporary = temporary;
 
@@ -415,7 +415,7 @@ namespace Gala {
             // disable reactivity so that workspace thumbs can get events
             reactive = false;
 
-            wm.get_display ().set_cursor (Meta.Cursor.DND_IN_DRAG);
+            display.set_cursor (Meta.Cursor.DND_IN_DRAG);
 
             return this;
         }
@@ -433,14 +433,14 @@ namespace Gala {
                 drag_canceled ();
             }
 
-            wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
+            display.set_cursor (Meta.Cursor.DEFAULT);
         }
 
         private void drag_canceled () {
             get_parent ().remove_child (this);
             restore_group ();
 
-            wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
+            display.set_cursor (Meta.Cursor.DEFAULT);
         }
 
         private void restore_group () {
diff --git a/src/Widgets/IconGroupContainer.vala b/src/Widgets/IconGroupContainer.vala
index f3ad1e9ce..100a30e3d 100644
--- a/src/Widgets/IconGroupContainer.vala
+++ b/src/Widgets/IconGroupContainer.vala
@@ -25,8 +25,6 @@ namespace Gala {
         public const int SPACING = 48;
         public const int GROUP_WIDTH = 64;
 
-        public WindowManager wm { get; construct; }
-
         public signal void request_reposition (bool animate);
 
         private float _scale_factor = 1.0f;
@@ -42,8 +40,8 @@ namespace Gala {
             }
         }
 
-        public IconGroupContainer (WindowManager wm, float scale) {
-            Object (wm: wm, scale_factor: scale);
+        public IconGroupContainer (float scale) {
+            Object (scale_factor: scale);
 
             layout_manager = new Clutter.BoxLayout ();
         }
@@ -62,7 +60,7 @@ namespace Gala {
 
             insert_child_at_index (group, index * 2);
 
-            var thumb = new WorkspaceInsertThumb (wm, index, scale_factor);
+            var thumb = new WorkspaceInsertThumb (index, scale_factor);
             thumb.notify["expanded"].connect_after (expanded_changed);
             insert_child_at_index (thumb, index * 2);
 
diff --git a/src/Widgets/MonitorClone.vala b/src/Widgets/MonitorClone.vala
index f4cd688cf..c54812773 100644
--- a/src/Widgets/MonitorClone.vala
+++ b/src/Widgets/MonitorClone.vala
@@ -26,7 +26,6 @@ namespace Gala {
     public class MonitorClone : Clutter.Actor {
         public signal void window_selected (Meta.Window window);
 
-        public WindowManager wm { get; construct; }
         public Meta.Display display { get; construct; }
         public int monitor { get; construct; }
         public GestureTracker gesture_tracker { get; construct; }
@@ -34,18 +33,18 @@ namespace Gala {
         private WindowCloneContainer window_container;
         private BackgroundManager background;
 
-        public MonitorClone (WindowManager wm, Meta.Display display, int monitor, GestureTracker gesture_tracker) {
-            Object (wm: wm, display: display, monitor: monitor, gesture_tracker: gesture_tracker);
+        public MonitorClone (Meta.Display display, int monitor, GestureTracker gesture_tracker) {
+            Object (display: display, monitor: monitor, gesture_tracker: gesture_tracker);
         }
 
         construct {
             reactive = true;
 
-            background = new BackgroundManager (wm, monitor, false);
+            background = new BackgroundManager (display, monitor, false);
 
             var scale = display.get_monitor_scale (monitor);
 
-            window_container = new WindowCloneContainer (wm, gesture_tracker, scale);
+            window_container = new WindowCloneContainer (display, gesture_tracker, scale);
             window_container.window_selected.connect ((w) => { window_selected (w); });
 
             display.window_entered_monitor.connect (window_entered);
diff --git a/src/Widgets/MultitaskingView.vala b/src/Widgets/MultitaskingView.vala
index fba782170..8997f5453 100644
--- a/src/Widgets/MultitaskingView.vala
+++ b/src/Widgets/MultitaskingView.vala
@@ -79,14 +79,14 @@ namespace Gala {
 
             workspaces = new Clutter.Actor ();
 
-            icon_groups = new IconGroupContainer (wm, display.get_monitor_scale (display.get_primary_monitor ()));
+            icon_groups = new IconGroupContainer (display.get_monitor_scale (display.get_primary_monitor ()));
 
             dock_clones = new Clutter.Actor ();
 
             brightness_effect = new Clutter.BrightnessContrastEffect ();
             update_brightness_effect ();
 
-            var blurred_bg = new BackgroundManager (wm, display.get_primary_monitor (), true, false);
+            var blurred_bg = new BackgroundManager (display, display.get_primary_monitor (), true, false);
             blurred_bg.add_effect (new BlurEffect (blurred_bg, 18));
             blurred_bg.add_effect (brightness_effect);
 
@@ -180,7 +180,7 @@ namespace Gala {
                         continue;
                     }
 
-                    var monitor_clone = new MonitorClone (wm, display, monitor, multitasking_gesture_tracker);
+                    var monitor_clone = new MonitorClone (display, monitor, multitasking_gesture_tracker);
                     monitor_clone.window_selected.connect (window_selected);
                     monitor_clone.visible = opened;
 
@@ -518,7 +518,7 @@ namespace Gala {
             unowned var manager = display.get_workspace_manager ();
             var scale = display.get_monitor_scale (display.get_primary_monitor ());
 
-            var workspace = new WorkspaceClone (wm, manager.get_workspace_by_index (num), multitasking_gesture_tracker, scale);
+            var workspace = new WorkspaceClone (manager.get_workspace_by_index (num), multitasking_gesture_tracker, scale);
             workspaces.insert_child_at_index (workspace, num);
             icon_groups.add_group (workspace.icon_group);
 
diff --git a/src/Widgets/PointerLocator.vala b/src/Widgets/PointerLocator.vala
index e0e93c3e3..e4924d792 100644
--- a/src/Widgets/PointerLocator.vala
+++ b/src/Widgets/PointerLocator.vala
@@ -25,7 +25,7 @@ namespace Gala {
 
         private const double BACKGROUND_OPACITY = 0.7;
 
-        public weak WindowManager wm { get; construct; }
+        public Meta.Display display { get; construct; }
 
         private float scaling_factor = 1.0f;
         private int surface_width = WIDTH_PX;
@@ -37,8 +37,8 @@ namespace Gala {
         private Cairo.Pattern stroke_color;
         private Cairo.Pattern fill_color;
 
-        public PointerLocator (WindowManager wm) {
-            Object (wm: wm);
+        public PointerLocator (Meta.Display display) {
+            Object (display: display);
         }
 
         construct {
@@ -144,7 +144,6 @@ namespace Gala {
             stroke_color = new Cairo.Pattern.rgb (rgba.red, rgba.green, rgba.blue);
             fill_color = new Cairo.Pattern.rgba (rgba.red, rgba.green, rgba.blue, BACKGROUND_OPACITY);
 
-            unowned var display = wm.get_display ();
             unowned var tracker = display.get_cursor_tracker ();
             Graphene.Point coords = {};
             tracker.get_pointer (out coords, null);
diff --git a/src/Widgets/WindowClone.vala b/src/Widgets/WindowClone.vala
index 256612e39..395806984 100644
--- a/src/Widgets/WindowClone.vala
+++ b/src/Widgets/WindowClone.vala
@@ -27,7 +27,7 @@ public class Gala.WindowClone : Clutter.Actor {
      */
     public signal void request_reposition ();
 
-    public WindowManager wm { get; construct; }
+    public Meta.Display display { get; construct; }
 
     public Meta.Window window { get; construct; }
 
@@ -95,9 +95,9 @@ public class Gala.WindowClone : Clutter.Actor {
     private Clutter.Actor window_icon;
     private Tooltip window_title;
 
-    public WindowClone (WindowManager wm, Meta.Window window, GestureTracker? gesture_tracker, float scale, bool overview_mode = false) {
+    public WindowClone (Meta.Display display, Meta.Window window, GestureTracker? gesture_tracker, float scale, bool overview_mode = false) {
         Object (
-            wm: wm,
+            display: display,
             window: window,
             gesture_tracker: gesture_tracker,
             monitor_scale_factor: scale,
@@ -373,7 +373,6 @@ public class Gala.WindowClone : Clutter.Actor {
         var initial_height = height;
 
         active = false;
-        unowned var display = wm.get_display ();
         var scale = display.get_monitor_scale (display.get_monitor_index_for_rect (rect));
 
         in_slot_animation = true;
@@ -618,7 +617,7 @@ public class Gala.WindowClone : Clutter.Actor {
                 selected ();
                 break;
             case Clutter.Button.MIDDLE:
-                close_window (wm.get_display ().get_current_time ());
+                close_window (display.get_current_time ());
                 break;
         }
     }
@@ -672,7 +671,7 @@ public class Gala.WindowClone : Clutter.Actor {
         close_button.opacity = 0;
         window_title.opacity = 0;
 
-        wm.get_display ().set_cursor (Meta.Cursor.DND_IN_DRAG);
+        display.set_cursor (Meta.Cursor.DND_IN_DRAG);
 
         return this;
     }
@@ -725,7 +724,7 @@ public class Gala.WindowClone : Clutter.Actor {
             }
         }
 
-        wm.get_display ().set_cursor (hovered ? Meta.Cursor.DND_MOVE: Meta.Cursor.DND_IN_DRAG);
+        display.set_cursor (hovered ? Meta.Cursor.DND_MOVE: Meta.Cursor.DND_IN_DRAG);
     }
 
     /**
@@ -739,7 +738,7 @@ public class Gala.WindowClone : Clutter.Actor {
 
         active_shape.show ();
 
-        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
+        display.set_cursor (Meta.Cursor.DEFAULT);
 
         if (destination is IconGroup) {
             workspace = ((IconGroup) destination).workspace;
@@ -829,7 +828,7 @@ public class Gala.WindowClone : Clutter.Actor {
         set_window_icon_position (slot.width, slot.height, monitor_scale_factor);
         window_icon.restore_easing_state ();
 
-        wm.get_display ().set_cursor (Meta.Cursor.DEFAULT);
+        display.set_cursor (Meta.Cursor.DEFAULT);
     }
 
     private void set_window_icon_position (float window_width, float window_height, float scale_factor, bool aligned = true) {
diff --git a/src/Widgets/WindowCloneContainer.vala b/src/Widgets/WindowCloneContainer.vala
index 7c619b4e3..f39571a33 100644
--- a/src/Widgets/WindowCloneContainer.vala
+++ b/src/Widgets/WindowCloneContainer.vala
@@ -28,7 +28,7 @@ namespace Gala {
         public int padding_right { get; set; default = 12; }
         public int padding_bottom { get; set; default = 12; }
 
-        public WindowManager wm { get; construct; }
+        public Meta.Display display { get; construct; }
         public GestureTracker? gesture_tracker { get; construct; }
         public bool overview_mode { get; construct; }
 
@@ -53,8 +53,8 @@ namespace Gala {
          */
         private unowned WindowClone? current_window = null;
 
-        public WindowCloneContainer (WindowManager wm, GestureTracker? gesture_tracker, float scale, bool overview_mode = false) {
-            Object (wm: wm, gesture_tracker: gesture_tracker, monitor_scale: scale, overview_mode: overview_mode);
+        public WindowCloneContainer (Meta.Display display, GestureTracker? gesture_tracker, float scale, bool overview_mode = false) {
+            Object (display: display, gesture_tracker: gesture_tracker, monitor_scale: scale, overview_mode: overview_mode);
         }
 
         private void reallocate () {
@@ -70,8 +70,6 @@ namespace Gala {
          * @param window The window for which to create the WindowClone for
          */
         public void add_window (Meta.Window window) {
-            unowned Meta.Display display = window.get_display ();
-
             var windows = new List<Meta.Window> ();
             foreach (unowned var child in get_children ()) {
                 unowned var clone = (WindowClone) child;
@@ -81,7 +79,7 @@ namespace Gala {
 
             var windows_ordered = InternalUtils.sort_windows (display, windows);
 
-            var new_window = new WindowClone (wm, window, gesture_tracker, monitor_scale, overview_mode);
+            var new_window = new WindowClone (display, window, gesture_tracker, monitor_scale, overview_mode);
 
             new_window.selected.connect ((clone) => window_selected (clone.window));
             new_window.destroy.connect ((_new_window) => {
@@ -149,7 +147,7 @@ namespace Gala {
                 windows.prepend (((WindowClone) child).window);
             }
 
-            var windows_ordered = InternalUtils.sort_windows (wm.get_display (), windows);
+            var windows_ordered = InternalUtils.sort_windows (display, windows);
             windows_ordered.reverse ();
 
             var i = 0;
diff --git a/src/Widgets/WindowIconActor.vala b/src/Widgets/WindowIconActor.vala
index f863532bb..8ab5b6f54 100644
--- a/src/Widgets/WindowIconActor.vala
+++ b/src/Widgets/WindowIconActor.vala
@@ -23,7 +23,6 @@ namespace Gala {
      */
     public class WindowIconActor : Clutter.Actor {
         public Meta.Window window { get; construct; }
-        public WindowManager wm { get; construct; }
 
         private float cur_icon_scale = 1.0f;
         private float desired_icon_scale = 1.0f;
@@ -102,8 +101,8 @@ namespace Gala {
         private WindowIcon? icon = null;
         private WindowIcon? old_icon = null;
 
-        public WindowIconActor (WindowManager wm, Meta.Window window) {
-            Object (wm: wm, window: window);
+        public WindowIconActor (Meta.Window window) {
+            Object (window: window);
         }
 
         construct {
diff --git a/src/Widgets/WindowOverview.vala b/src/Widgets/WindowOverview.vala
index 8618263c7..3d349045d 100644
--- a/src/Widgets/WindowOverview.vala
+++ b/src/Widgets/WindowOverview.vala
@@ -123,7 +123,7 @@ public class Gala.WindowOverview : Clutter.Actor, ActivatableComponent {
             var geometry = display.get_monitor_geometry (i);
             var scale = display.get_monitor_scale (i);
 
-            window_clone_container = new WindowCloneContainer (wm, null, scale, true) {
+            window_clone_container = new WindowCloneContainer (display, null, scale, true) {
                 padding_top = TOP_GAP,
                 padding_left = BORDER,
                 padding_right = BORDER,
diff --git a/src/Widgets/WorkspaceClone.vala b/src/Widgets/WorkspaceClone.vala
index b5b3fc484..b3000a2ff 100644
--- a/src/Widgets/WorkspaceClone.vala
+++ b/src/Widgets/WorkspaceClone.vala
@@ -27,10 +27,10 @@ namespace Gala {
         private int last_width;
         private int last_height;
 
-        public FramedBackground (WindowManager wm) {
+        public FramedBackground (Meta.Display display) {
             Object (
-                wm: wm,
-                monitor_index: wm.get_display ().get_primary_monitor (),
+                display: display,
+                monitor_index: display.get_primary_monitor (),
                 control_position: false,
                 rounded_corners: true
             );
@@ -38,8 +38,8 @@ namespace Gala {
 
         construct {
             pipeline = new Cogl.Pipeline (Clutter.get_default_backend ().get_cogl_context ());
-            var primary = wm.get_display ().get_primary_monitor ();
-            var monitor_geom = wm.get_display ().get_monitor_geometry (primary);
+            var primary = display.get_primary_monitor ();
+            var monitor_geom = display.get_monitor_geometry (primary);
 
             var effect = new ShadowEffect ("workspace");
             add_effect (effect);
@@ -139,7 +139,6 @@ namespace Gala {
          */
         public signal void selected (bool close_view);
 
-        public WindowManager wm { get; construct; }
         public Meta.Workspace workspace { get; construct; }
         public GestureTracker gesture_tracker { get; construct; }
         public IconGroup icon_group { get; private set; }
@@ -163,8 +162,8 @@ namespace Gala {
 
         private uint hover_activate_timeout = 0;
 
-        public WorkspaceClone (WindowManager wm, Meta.Workspace workspace, GestureTracker gesture_tracker, float scale) {
-            Object (wm: wm, workspace: workspace, gesture_tracker: gesture_tracker, scale_factor: scale);
+        public WorkspaceClone (Meta.Workspace workspace, GestureTracker gesture_tracker, float scale) {
+            Object (workspace: workspace, gesture_tracker: gesture_tracker, scale_factor: scale);
         }
 
         construct {
@@ -178,17 +177,17 @@ namespace Gala {
             background_click_action.clicked.connect (() => {
                 selected (true);
             });
-            background = new FramedBackground (wm);
+            background = new FramedBackground (display);
             background.add_action (background_click_action);
 
-            window_container = new WindowCloneContainer (wm, gesture_tracker, scale_factor) {
+            window_container = new WindowCloneContainer (display, gesture_tracker, scale_factor) {
                 width = monitor_geometry.width,
                 height = monitor_geometry.height,
             };
             window_container.window_selected.connect ((w) => { window_selected (w); });
             window_container.requested_close.connect (() => selected (true));
 
-            icon_group = new IconGroup (wm, workspace, scale_factor);
+            icon_group = new IconGroup (display, workspace, scale_factor);
             icon_group.selected.connect (() => selected (true));
 
             var icons_drop_action = new DragDropAction (DragDropActionType.DESTINATION, "multitaskingview-window");
diff --git a/src/Widgets/WorkspaceInsertThumb.vala b/src/Widgets/WorkspaceInsertThumb.vala
index 10db5dc92..8e326b772 100644
--- a/src/Widgets/WorkspaceInsertThumb.vala
+++ b/src/Widgets/WorkspaceInsertThumb.vala
@@ -7,8 +7,6 @@
 public class Gala.WorkspaceInsertThumb : Clutter.Actor {
     public const int EXPAND_DELAY = 300;
 
-    public WindowManager wm { get; construct; }
-
     public int workspace_index { get; construct set; }
     public bool expanded { get; set; default = false; }
     public int delay { get; set; default = EXPAND_DELAY; }
@@ -27,8 +25,8 @@ public class Gala.WorkspaceInsertThumb : Clutter.Actor {
 
     private uint expand_timeout = 0;
 
-    public WorkspaceInsertThumb (WindowManager wm, int workspace_index, float scale) {
-        Object (wm: wm, workspace_index: workspace_index, scale_factor: scale);
+    public WorkspaceInsertThumb (int workspace_index, float scale) {
+        Object (workspace_index: workspace_index, scale_factor: scale);
 
         reallocate ();
         opacity = 0;
diff --git a/src/WindowManager.vala b/src/WindowManager.vala
index e2835e4d2..b94f7bb91 100644
--- a/src/WindowManager.vala
+++ b/src/WindowManager.vala
@@ -157,7 +157,7 @@ namespace Gala {
             screensaver = new ScreenSaverManager (screen_shield);
 
             DBus.init (this);
-            DBusAccelerator.init (this);
+            DBusAccelerator.init (display);
             MediaFeedback.init ();
 
             WindowListener.init (display);
@@ -218,7 +218,7 @@ namespace Gala {
             stage.remove_child (window_group);
             ui_group.add_child (window_group);
 
-            background_group = new BackgroundContainer (this);
+            background_group = new BackgroundContainer (display);
             ((BackgroundContainer)background_group).show_background_menu.connect (daemon_manager.show_background_menu);
             window_group.add_child (background_group);
             window_group.set_child_below_sibling (background_group, null);
@@ -337,9 +337,9 @@ namespace Gala {
                 notification_group = new Clutter.Actor ();
                 ui_group.add_child (notification_group);
 
-                pointer_locator = new PointerLocator (this);
+                pointer_locator = new PointerLocator (display);
                 ui_group.add_child (pointer_locator);
-                ui_group.add_child (new DwellClickTimer (this));
+                ui_group.add_child (new DwellClickTimer (display));
 
                 ui_group.add_child (screen_shield);