diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index 8cd93041978..ab22f73dd8f 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -18,48 +18,53 @@
                   xmlns:settings="http://schemas.android.com/apk/res-auto"
                   android:title="@string/configure_notification_settings">
 
-    <com.android.settings.widget.VideoPreference
-        android:key="notification_model_illustration"
-        android:title="@string/summary_placeholder"
-        settings:animation="@raw/notification_interruption_model"
-        settings:controller="com.android.settings.widget.VideoPreferenceController"
-        android:persistent="false" />
-
-    <Preference
-        android:key="notification_history"
-        android:title="@string/notification_history"
-        android:summary="@string/notification_history_summary"
-        settings:allowDividerAbove="true"
-        settings:allowDividerBelow="false"
-        android:order="2">
-        <intent
-            android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />
-    </Preference>
-
-    <Preference
-        android:key="notification_bubbles"
-        android:title="@string/notification_bubbles_title"
-        android:summary="@string/notifications_bubble_setting_on_summary"
-        android:order="4"
-        settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"
-        android:fragment="com.android.settings.notification.BubbleNotificationSettings"
-    />
+    <PreferenceCategory
+        android:key="conversation_category"
+        android:title="@string/conversation_notifs_category">
+        <Preference
+            android:key="conversations"
+            android:order="1"
+            android:title="@string/conversations_category_title"
+            android:summary=" "
+            settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
+            android:fragment="com.android.settings.notification.app.ConversationListSettings"
+        />
+        <Preference
+            android:key="notification_bubbles"
+            android:order="2"
+            android:title="@string/notification_bubbles_title"
+            android:summary="@string/notifications_bubble_setting_on_summary"
+            settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"
+            android:fragment="com.android.settings.notification.BubbleNotificationSettings"
+        />
+    </PreferenceCategory>
 
     <PreferenceCategory
         android:key="recent_notifications_category"
-        android:title="@string/recent_notifications"
-        settings:allowDividerAbove="true"
-        android:order="5">
+        android:title="@string/recent_notifications">
         <!-- Placeholder for a list of recent apps -->
+        <com.android.settings.widget.PrimarySwitchPreference
+            android:key="app1"
+            android:title=" "
+            android:summary=" "
+            android:order="5"/>
+        <com.android.settings.widget.PrimarySwitchPreference
+            android:key="app2"
+            android:title=" "
+            android:summary=" "
+            android:order="6"/>
+        <com.android.settings.widget.PrimarySwitchPreference
+            android:key="app3"
+            android:title=" "
+            android:summary=" "
+            android:order="7"/>
 
         <!-- See all apps button -->
         <Preference
             android:key="all_notifications"
+            android:order="10"
             android:title="@string/notifications_title"
             android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
-            android:order="6"
             settings:searchable="false">
             <extra
                 android:name="classname"
@@ -67,32 +72,51 @@
         </Preference>
     </PreferenceCategory>
 
-
     <PreferenceCategory
         android:key="configure_notifications_lock"
-        android:title="@string/lock_screen_notifications_title"
-        android:order="10">
+        android:title="@string/lock_screen_notifications_title">
+        <Preference
+            android:key="notification_history"
+            android:order="11"
+            android:title="@string/notification_history"
+            android:summary="@string/notification_history_summary">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="com.android.settings"
+                android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />
+        </Preference>
+        <Preference
+            android:key="notification_access"
+            android:order="12"
+            android:title="@string/manage_notification_access_title"
+            android:summary="@string/manage_notification_access_summary"
+            android:fragment="com.android.settings.notification.NotificationAccessSettings"
+            settings:controller="com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessController" />
         <!-- When device is locked -->
         <com.android.settings.RestrictedListPreference
             android:key="lock_screen_notifications"
+            android:order="13"
             android:title="@string/lock_screen_notifs_title"
             android:singleLineTitle="false"
             android:summary="@string/summary_placeholder" />
 
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="lock_screen_redact"
+            android:order="14"
             android:title="@string/lock_screen_notifs_redact"
             android:summary="@string/lock_screen_notifs_redact_summary"
             settings:controller="com.android.settings.notification.RedactNotificationPreferenceController" />
 
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="lock_screen_work_redact"
+            android:order="15"
             android:title="@string/lock_screen_notifs_redact_work"
             android:summary="@string/lock_screen_notifs_redact_work_summary"
             settings:controller="com.android.settings.notification.RedactNotificationPreferenceController" />
 
         <SwitchPreference
             android:key="notification_lockscreen_bypass"
+            android:order="16"
             android:title="@string/lockscreen_bypass_title"
             android:summary="@string/lockscreen_bypass_summary"
             settings:searchable="false"
@@ -101,58 +125,57 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="configure_notifications_advanced"
-        android:order="15"
-        settings:initialExpandedChildrenCount="0">
-
-        <SwitchPreference
-            android:key="silent_icons"
-            android:title="@string/silent_notifications_status_bar"
-            settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
-
-        <SwitchPreference
-            android:key="show_snooze_options"
-            android:title="@string/snooze_options_title"
-            settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
-
-        <SwitchPreference
-            android:key="notification_assistant"
-            android:title="@string/notification_assistant_title"
-            android:summary="@string/notification_assistant_summary"/>
-
-        <!-- Notification badging -->
-        <SwitchPreference
-            android:key="notification_badging"
-            android:title="@string/notification_badging_title"
-            settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
-
-        <!-- Pulse notification light -->
-        <SwitchPreference
-            android:key="notification_pulse"
-            android:title="@string/notification_pulse_title"
-            settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
-
-        <!-- Default notification ringtone -->
-        <com.android.settings.DefaultRingtonePreference
-            android:key="notification_default_ringtone"
-            android:title="@string/notification_ringtone_title"
-            android:dialogTitle="@string/notification_ringtone_title"
-            android:summary="@string/summary_placeholder"
-            android:ringtoneType="notification"
-            settings:searchable="false"/>
-
-        <Preference
-            android:key="gesture_swipe_down_fingerprint_notifications"
-            android:title="@string/fingerprint_swipe_for_notifications_title"
-            android:fragment="com.android.settings.gestures.SwipeToNotificationSettings"
-            settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController"/>
-
+        android:key="advanced_section_header"
+        android:title="@string/advanced_section_header">
         <com.android.settingslib.RestrictedPreference
             android:key="zen_mode_notifications"
+            android:order="17"
             android:title="@string/zen_mode_settings_title"
             settings:useAdminDisabledSummary="true"
             android:fragment="com.android.settings.notification.zen.ZenModeSettings"
             settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
-            settings:allowDividerAbove="false"/>
+        />
+        <com.android.settingslib.RestrictedPreference
+            android:key="app_and_notif_cell_broadcast_settings"
+            android:order="18"
+            android:title="@string/cell_broadcast_settings"
+            settings:useAdminDisabledSummary="true">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetPackage="@string/config_cell_broadcast_receiver_package"
+                android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
+        </com.android.settingslib.RestrictedPreference>
+
+        <SwitchPreference
+             android:key="silent_icons"
+             android:order="19"
+             android:title="@string/silent_notifications_status_bar"
+             settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
+
+        <SwitchPreference
+            android:key="show_snooze_options"
+            android:order="20"
+            android:title="@string/snooze_options_title"
+            settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
+
+        <!-- Notification badging -->
+        <SwitchPreference
+            android:key="notification_badging"
+            android:order="21"
+            android:title="@string/notification_badging_title"
+            settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
+
+        <!-- Pulse notification light, on devices that support it -->
+        <SwitchPreference
+            android:key="notification_pulse"
+            android:order="22"
+            android:title="@string/notification_pulse_title"
+            settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
+
+        <SwitchPreference
+            android:key="notification_assistant"
+            android:order="23"
+            android:title="@string/notification_assistant_title"
+            android:summary="@string/notification_assistant_summary"/>
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/configure_notification_settings_v2.xml b/res/xml/configure_notification_settings_v2.xml
deleted file mode 100644
index 17033126711..00000000000
--- a/res/xml/configure_notification_settings_v2.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                  xmlns:settings="http://schemas.android.com/apk/res-auto"
-                  android:title="@string/configure_notification_settings">
-
-    <PreferenceCategory
-        android:key="conversation_category"
-        android:title="@string/conversation_notifs_category">
-        <Preference
-            android:key="conversations"
-            android:order="1"
-            android:title="@string/conversations_category_title"
-            android:summary=" "
-            settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
-            android:fragment="com.android.settings.notification.app.ConversationListSettings"
-        />
-        <Preference
-            android:key="notification_bubbles"
-            android:order="2"
-            android:title="@string/notification_bubbles_title"
-            android:summary="@string/notifications_bubble_setting_on_summary"
-            settings:controller="com.android.settings.notification.BubbleSummaryNotificationPreferenceController"
-            android:fragment="com.android.settings.notification.BubbleNotificationSettings"
-        />
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="recent_notifications_category"
-        android:title="@string/recent_notifications">
-        <!-- Placeholder for a list of recent apps -->
-        <com.android.settings.widget.PrimarySwitchPreference
-            android:key="app1"
-            android:title=" "
-            android:summary=" "
-            android:order="5"/>
-        <com.android.settings.widget.PrimarySwitchPreference
-            android:key="app2"
-            android:title=" "
-            android:summary=" "
-            android:order="6"/>
-        <com.android.settings.widget.PrimarySwitchPreference
-            android:key="app3"
-            android:title=" "
-            android:summary=" "
-            android:order="7"/>
-
-        <!-- See all apps button -->
-        <Preference
-            android:key="all_notifications"
-            android:order="10"
-            android:title="@string/notifications_title"
-            android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
-            settings:searchable="false">
-            <extra
-                android:name="classname"
-                android:value="com.android.settings.Settings$NotificationAppListActivity"/>
-        </Preference>
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="configure_notifications_lock"
-        android:title="@string/lock_screen_notifications_title">
-        <Preference
-            android:key="notification_history"
-            android:order="11"
-            android:title="@string/notification_history"
-            android:summary="@string/notification_history_summary">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="com.android.settings"
-                android:targetClass="com.android.settings.notification.history.NotificationHistoryActivity" />
-        </Preference>
-        <Preference
-            android:key="notification_access"
-            android:order="12"
-            android:title="@string/manage_notification_access_title"
-            android:summary="@string/manage_notification_access_summary"
-            android:fragment="com.android.settings.notification.NotificationAccessSettings"
-            settings:controller="com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessController" />
-        <!-- When device is locked -->
-        <com.android.settings.RestrictedListPreference
-            android:key="lock_screen_notifications"
-            android:order="13"
-            android:title="@string/lock_screen_notifs_title"
-            android:singleLineTitle="false"
-            android:summary="@string/summary_placeholder" />
-
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="lock_screen_redact"
-            android:order="14"
-            android:title="@string/lock_screen_notifs_redact"
-            android:summary="@string/lock_screen_notifs_redact_summary"
-            settings:controller="com.android.settings.notification.RedactNotificationPreferenceController" />
-
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="lock_screen_work_redact"
-            android:order="15"
-            android:title="@string/lock_screen_notifs_redact_work"
-            android:summary="@string/lock_screen_notifs_redact_work_summary"
-            settings:controller="com.android.settings.notification.RedactNotificationPreferenceController" />
-
-        <SwitchPreference
-            android:key="notification_lockscreen_bypass"
-            android:order="16"
-            android:title="@string/lockscreen_bypass_title"
-            android:summary="@string/lockscreen_bypass_summary"
-            settings:searchable="false"
-            settings:controller="com.android.settings.biometrics.face.FaceSettingsLockscreenBypassPreferenceController" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="advanced_section_header"
-        android:title="@string/advanced_section_header">
-        <com.android.settingslib.RestrictedPreference
-            android:key="zen_mode_notifications"
-            android:order="17"
-            android:title="@string/zen_mode_settings_title"
-            settings:useAdminDisabledSummary="true"
-            android:fragment="com.android.settings.notification.zen.ZenModeSettings"
-            settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
-        />
-        <com.android.settingslib.RestrictedPreference
-            android:key="app_and_notif_cell_broadcast_settings"
-            android:order="18"
-            android:title="@string/cell_broadcast_settings"
-            settings:useAdminDisabledSummary="true">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetPackage="@string/config_cell_broadcast_receiver_package"
-                android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
-        </com.android.settingslib.RestrictedPreference>
-
-        <SwitchPreference
-             android:key="silent_icons"
-             android:order="19"
-             android:title="@string/silent_notifications_status_bar"
-             settings:controller="com.android.settings.notification.SilentStatusBarPreferenceController"/>
-
-        <SwitchPreference
-            android:key="show_snooze_options"
-            android:order="20"
-            android:title="@string/snooze_options_title"
-            settings:controller="com.android.settings.notification.SnoozeNotificationPreferenceController" />
-
-        <!-- Notification badging -->
-        <SwitchPreference
-            android:key="notification_badging"
-            android:order="21"
-            android:title="@string/notification_badging_title"
-            settings:controller="com.android.settings.notification.BadgingNotificationPreferenceController"/>
-
-        <!-- Pulse notification light, on devices that support it -->
-        <SwitchPreference
-            android:key="notification_pulse"
-            android:order="22"
-            android:title="@string/notification_pulse_title"
-            settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
-
-        <SwitchPreference
-            android:key="notification_assistant"
-            android:order="23"
-            android:title="@string/notification_assistant_title"
-            android:summary="@string/notification_assistant_summary"/>
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index 22b4311e1fa..e3d024996d6 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.notification;
 
-import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
-
 import android.app.Activity;
 import android.app.Application;
 import android.app.settings.SettingsEnums;
@@ -29,18 +27,14 @@ import android.os.Bundle;
 import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.text.TextUtils;
-import android.util.FeatureFlagUtils;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
 import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.RingtonePreference;
-import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.OnActivityResultListener;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -79,9 +73,6 @@ public class ConfigureNotificationSettings extends DashboardFragment implements
 
     @Override
     protected int getPreferenceScreenResId() {
-        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
-            return R.xml.configure_notification_settings_v2;
-        }
         return R.xml.configure_notification_settings;
     }
 
@@ -121,37 +112,12 @@ public class ConfigureNotificationSettings extends DashboardFragment implements
         controllers.add(new NotificationAssistantPreferenceController(context,
                 new NotificationBackend(), host, KEY_NAS));
 
-        if (FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME)) {
-            controllers.add(new EmergencyBroadcastPreferenceController(context,
-                    "app_and_notif_cell_broadcast_settings"));
-        }
+        controllers.add(new EmergencyBroadcastPreferenceController(context,
+                "app_and_notif_cell_broadcast_settings"));
+
         return controllers;
     }
 
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        // TODO(b/182237530): This method should be removed when this flag is deprecated.
-        if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
-            final PreferenceScreen screen = getPreferenceScreen();
-            final Bundle arguments = getArguments();
-
-            if (screen == null) {
-                return;
-            }
-            if (arguments != null) {
-                final String highlightKey = arguments.getString(EXTRA_FRAGMENT_ARG_KEY);
-                if (!TextUtils.isEmpty(highlightKey)) {
-                    final PreferenceCategory advancedCategory =
-                            screen.findPreference(KEY_ADVANCED_CATEGORY);
-                    // Has highlight row - expand everything
-                    advancedCategory.setInitialExpandedChildrenCount(Integer.MAX_VALUE);
-                    scrollToPreference(advancedCategory);
-                }
-            }
-        }
-    }
-
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
         if (preference instanceof RingtonePreference) {