diff --git a/core/modules/views_ui/views_ui.theme.inc b/core/modules/views_ui/views_ui.theme.inc
index cd259ca..d69ea1d 100644
--- a/core/modules/views_ui/views_ui.theme.inc
+++ b/core/modules/views_ui/views_ui.theme.inc
@@ -125,6 +125,8 @@ function theme_views_ui_build_group_filter_form($variables) {
       $form['default_group'][$group_id],
       $form['default_group_multiple'][$group_id],
     ];
+    unset($form['default_group'][$group_id]);
+    unset($form['default_group_multiple'][$group_id]);
     $link = [
       '#type' => 'link',
       '#url' => Url::fromRoute('<none>', [], [
@@ -143,6 +145,7 @@ function theme_views_ui_build_group_filter_form($variables) {
       '#title' => SafeMarkup::format('<span>@text</span>', ['@text' => t('Remove')]),
     ];
     $remove = [$form['group_items'][$group_id]['remove'], $link];
+    unset($form['group_items'][$group_id]['remove']);
     $data = array(
       'default' => ['data' => $default],
       'weight' => drupal_render($form['group_items'][$group_id]['weight']),