diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 0ec7a373d..87b2660a2 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1034,7 +1034,6 @@ meta_display_grab_window_buttons (MetaDisplay *display,
 
   if (display->window_grab_modifiers != 0)
     {
-      gboolean debug = g_getenv ("MUTTER_DEBUG_BUTTON_GRABS") != NULL;
       int i;
       for (i = 1; i < 4; i++)
         {
@@ -1042,15 +1041,6 @@ meta_display_grab_window_buttons (MetaDisplay *display,
                                    TRUE,
                                    FALSE,
                                    i, display->window_grab_modifiers);
-
-          /* This is for debugging, since I end up moving the Xnest
-           * otherwise ;-)
-           */
-          if (debug)
-            meta_change_button_grab (display, xwindow,
-                                     TRUE,
-                                     FALSE,
-                                     i, ControlMask);
         }
 
       /* In addition to grabbing Alt+Button1 for moving the window,
@@ -1070,7 +1060,6 @@ void
 meta_display_ungrab_window_buttons (MetaDisplay *display,
                                     Window       xwindow)
 {
-  gboolean debug;
   int i;
 
   if (meta_is_wayland_compositor ())
@@ -1079,7 +1068,6 @@ meta_display_ungrab_window_buttons (MetaDisplay *display,
   if (display->window_grab_modifiers == 0)
     return;
 
-  debug = g_getenv ("MUTTER_DEBUG_BUTTON_GRABS") != NULL;
   i = 1;
   while (i < 4)
     {
@@ -1087,10 +1075,6 @@ meta_display_ungrab_window_buttons (MetaDisplay *display,
                                FALSE, FALSE, i,
                                display->window_grab_modifiers);
 
-      if (debug)
-        meta_change_button_grab (display, xwindow,
-                                 FALSE, FALSE, i, ControlMask);
-
       ++i;
     }
 }
diff --git a/src/core/window.c b/src/core/window.c
index 45638c843..2ff1995bf 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -7904,9 +7904,6 @@ meta_window_handle_ungrabbed_event (MetaWindow         *window,
    */
 
   grab_mask = display->window_grab_modifiers;
-  if (g_getenv ("MUTTER_DEBUG_BUTTON_GRABS"))
-    grab_mask |= CLUTTER_CONTROL_MASK;
-
   unmodified = (event->button.modifier_state & grab_mask) == 0;
   fully_modified = grab_mask && (event->button.modifier_state & grab_mask) == grab_mask;