diff --git a/panels/keyboard/cc-keyboard-option.c b/panels/keyboard/cc-keyboard-option.c
index 30502b9d1..229ceaed6 100644
--- a/panels/keyboard/cc-keyboard-option.c
+++ b/panels/keyboard/cc-keyboard-option.c
@@ -38,7 +38,6 @@
 
 #define XKB_OPTION_GROUP_LVL3 "lv3"
 #define XKB_OPTION_GROUP_COMP "Compose key"
-#define XKB_OPTION_GROUP_GRP  "grp"
 
 enum
 {
@@ -97,30 +96,6 @@ static const gchar *xkb_option_comp_whitelist[] = {
   NULL
 };
 
-static const gchar *xkb_option_grp_whitelist[] = {
-  "grp:toggle",
-  "grp:lalt_toggle",
-  "grp:lwin_toggle",
-  "grp:rwin_toggle",
-  "grp:lshift_toggle",
-  "grp:rshift_toggle",
-  "grp:lctrl_toggle",
-  "grp:rctrl_toggle",
-  "grp:sclk_toggle",
-  "grp:menu_toggle",
-  "grp:caps_toggle",
-  "grp:shift_caps_toggle",
-  "grp:alt_caps_toggle",
-  "grp:alt_space_toggle",
-  "grp:ctrl_shift_toggle",
-  "grp:lctrl_lshift_toggle",
-  "grp:rctrl_rshift_toggle",
-  "grp:ctrl_alt_toggle",
-  "grp:alt_shift_toggle",
-  "grp:lalt_lshift_toggle",
-  NULL
-};
-
 static GList *objects_list = NULL;
 
 GType cc_keyboard_option_get_type (void);
@@ -257,8 +232,6 @@ cc_keyboard_option_constructed (GObject *object)
     self->whitelist = xkb_option_lvl3_whitelist;
   else if (g_str_equal (self->group, XKB_OPTION_GROUP_COMP))
     self->whitelist = xkb_option_comp_whitelist;
-  else if (g_str_equal (self->group, XKB_OPTION_GROUP_GRP))
-    self->whitelist = xkb_option_grp_whitelist;
   else
     g_assert_not_reached ();
 
@@ -346,11 +319,6 @@ cc_keyboard_option_get_all (void)
                                                "group", XKB_OPTION_GROUP_COMP,
                                                "description", _("Compose Key"),
                                                NULL));
-  objects_list = g_list_prepend (objects_list,
-                                 g_object_new (CC_TYPE_KEYBOARD_OPTION,
-                                               "group", XKB_OPTION_GROUP_GRP,
-                                               "description", _("Modifiers-only switch to next source"),
-                                               NULL));
   return objects_list;
 }