diff --git a/Android.bp b/Android.bp
index 48d0649b627..43c83c98737 100644
--- a/Android.bp
+++ b/Android.bp
@@ -70,7 +70,6 @@ android_library {
         "res-export", // for external usage
         "res-product",
         "Evolver/res",
-        "SettingsGoogle/res",
     ],
     static_libs: [
         // External dependencies
@@ -209,11 +208,6 @@ filegroup {
     srcs: ["proguard.flags"],
 }
 
-filegroup {
-    name: "Settings_manifest",
-    srcs: ["AndroidManifest.xml"],
-}
-
 android_library_import {
     name: "glide",
     aars: ["libs/glide-4.16.0.aar"],
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2a8f8f816ff..bbba1a78235 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -175,7 +175,7 @@
             android:defaultToDeviceProtectedStorage="true"
             android:directBootAware="true"
             android:appComponentFactory="androidx.core.app.CoreComponentFactory"
-            tools:replace="android:appComponentFactory,android:name"
+            tools:replace="android:appComponentFactory"
             android:gwpAsanMode="always"
             android:enableOnBackInvokedCallback="true">
 
diff --git a/SettingsGoogle b/SettingsGoogle
deleted file mode 120000
index f02870c6106..00000000000
--- a/SettingsGoogle
+++ /dev/null
@@ -1 +0,0 @@
-../../../vendor/pixel-framework/SettingsGoogle
\ No newline at end of file
diff --git a/res/xml/about_legal.xml b/res/xml/about_legal.xml
index b8e12a6313b..37b7d904ab7 100644
--- a/res/xml/about_legal.xml
+++ b/res/xml/about_legal.xml
@@ -60,12 +60,6 @@
         android:title="@string/webview_license_title"
         settings:controller="com.android.settings.deviceinfo.legal.WebViewLicensePreferenceController" />
 
-    <Preference
-        android:key="legal_source_code"
-        android:summary="@string/legal_source_code_description"
-        android:title="@string/legal_source_code_title"
-        settings:controller="com.google.android.settings.deviceinfo.legal.SourceCodeController" />
-
     <Preference
         android:key="wallpaper_attributions"
         android:title="@string/wallpaper_attributions"
diff --git a/res/xml/accessibility_vibration_intensity_settings.xml b/res/xml/accessibility_vibration_intensity_settings.xml
index ae44d7358c4..e74a15ac879 100644
--- a/res/xml/accessibility_vibration_intensity_settings.xml
+++ b/res/xml/accessibility_vibration_intensity_settings.xml
@@ -59,14 +59,6 @@
             app:keywords="@string/keywords_alarm_vibration"
             app:controller="com.android.settings.accessibility.AlarmVibrationIntensityPreferenceController" />
 
-        <SwitchPreferenceCompat
-            android:key="adaptive_alert_vibration"
-            android:summary="@string/adaptive_alert_vibration_summary"
-            android:title="@string/adaptive_alert_vibration_title"
-            app:controller="com.google.android.settings.accessibility.AdaptiveHapticsTogglePreferenceController"
-            app:keywords="@string/keywords_adaptive_alert_vibration"
-            app:searchable="@bool/config_adaptive_alert_vibration_enabled" />
-
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index c0c2a864527..74ef85604ba 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -26,27 +26,13 @@
         android:title="@string/battery_saver_master_switch_title"
         settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController"/>
 
-    <PreferenceCategory android:layout="@layout/preference_category_no_label" android:key="battery_saver_entry" android:order="30" settings:controller="com.google.android.settings.fuelgauge.batterysaver.BatterySaverModePreferenceController">
-
-        <com.android.settingslib.widget.SelectorWithWidgetPreference android:title="@string/basic_battery_saver_title" android:key="basic_battery_saver_entry" 
-android:summary="@string/basic_battery_saver_summary"/>
-
-        <com.android.settingslib.widget.SelectorWithWidgetPreference android:title="@string/extreme_battery_saver_title" android:key="extreme_battery_saver_entry" android:summary="@string/extreme_battery_saver_summary"/>
-    </PreferenceCategory>
-
     <Preference
         android:order="50"
         android:key="battery_saver_schedule"
         android:fragment="com.android.settings.fuelgauge.batterysaver.BatterySaverScheduleSettings"
         android:title="@string/battery_saver_schedule_settings_title"
         settings:keywords="@string/keywords_battery_saver_schedule"
-        settings:controller="com.google.android.settings.fuelgauge.batterysaver.BatterySaverScheduleAndRemindersSettings"/>
-
-    <PreferenceCategory android:layout="@layout/preference_category_no_label" android:key="battery_saver_expand_entry" android:order="70" settings:controller="com.google.android.settings.fuelgauge.batterysaver.AdaptiveBatteryExpandController">
-
-        <com.android.settingslib.widget.TopIntroPreference android:title="@string/smart_battery_summary" android:key="adaptive_battery_top_intro" android:order="110" settings:searchable="false"/>
-        <com.android.settingslib.widget.MainSwitchPreference android:title="@string/adaptive_battery_switch_title" android:key="adaptive_battery" android:order="130"/>
-    </PreferenceCategory>
+        settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverSchedulePreferenceController"/>
 
     <SwitchPreferenceCompat
         android:order="80"
@@ -60,6 +46,5 @@ android:summary="@string/basic_battery_saver_summary"/>
         android:order="100"
         android:key="battery_saver_footer_preference"
         android:title="@*android:string/battery_saver_description"
-        settings:controller="com.google.android.settings.fuelgauge.batterysaver.BatterySaverFooterPreferenceController"
         settings:searchable="false"/>
 </PreferenceScreen>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 513ad05b121..a64471afd36 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -274,13 +274,6 @@
             android:defaultValue="false"
             settings:requiresFeature="lineagehardware:FEATURE_HIGH_TOUCH_POLLING_RATE" />
 
-        <SwitchPreferenceCompat
-            android:key="touch_sensitivity"
-            android:title="@string/touch_sensitivity_title"
-            android:summary="@string/touch_sensitivity_summary"
-            settings:controller="com.google.android.settings.touch.TouchSensitivityPreferenceController"
-            settings:keywords="@string/keywords_touch_sensitivity" />
-
         <lineageos.preference.LineageSystemSettingSwitchPreference
             android:key="high_touch_sensitivity_enable"
             android:title="@string/high_touch_sensitivity_title"
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index c7ab8ff92f5..1519832a27a 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -33,12 +33,6 @@
         <intent android:action="org.lineageos.settings.device.GESTURE_SETTINGS" />
     </lineageos.preference.RemotePreference>
 
-    <Preference
-        android:key="columbus_input_summary"
-        android:title="@string/columbus_title"
-        android:fragment="com.google.android.settings.gestures.columbus.ColumbusSettings"
-        settings:controller="com.google.android.settings.gestures.columbus.ColumbusPreferenceController" />
-
     <Preference
         android:key="gesture_swipe_down_fingerprint_input_summary"
         android:title="@string/fingerprint_swipe_for_notifications_title"
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index d40f85f50ec..41d6f6c5e8f 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -190,11 +190,6 @@
             settings:controller="com.android.settings.network.telephony.CarrierSettingsVersionPreferenceController"
             settings:enableCopying="true"/>
 
-        <Preference
-            android:key="speed_boost_settings"
-            android:title="@string/speed_boost_title"
-            settings:controller="com.google.android.settings.network.telephony.SpeedBoostPreferenceController" />
-
         <!-- IMEI -->
         <Preference
             android:key="network_mode_imei_info"
diff --git a/res/xml/network_provider_calls_sms.xml b/res/xml/network_provider_calls_sms.xml
index 448b5671524..7f2ba8ab8c4 100644
--- a/res/xml/network_provider_calls_sms.xml
+++ b/res/xml/network_provider_calls_sms.xml
@@ -45,32 +45,4 @@
         settings:controller="com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController"
         settings:allowDividerAbove="true"
         />
-
-    <PreferenceCategory
-        android:key="connectivity_helper_call_quality_category"
-        android:order="30"
-        android:title="@string/connectivity_helper_call_quality_category"
-        settings:allowDividerAbove="true">
-
-        <SwitchPreferenceCompat
-            android:icon="@drawable/ic_connectivity_helper_call_quality"
-            android:key="connectivity_helper_call_quality"
-            android:summary="@string/connectivity_helper_call_quality_summary"
-            android:title="@string/connectivity_helper_call_quality_title"
-            settings:controller="com.google.android.settings.network.ConnectivityHelperCallQualityPreferenceController" />
-
-        <SwitchPreferenceCompat
-            android:key="connectivity_helper_d2d"
-            android:order="40"
-            android:summary="@string/connectivity_helper_d2d_summary"
-            android:title="@string/connectivity_helper_d2d_title"
-            settings:controller="com.google.android.settings.network.ConnectivityHelperDeviceToDevicePreferenceController" />
-
-        <com.android.settingslib.widget.FooterPreference
-            android:key="connectivity_helper_footer"
-            android:selectable="false"
-            android:title="@string/connectivity_helper_footnote"
-            settings:searchable="false" />
-    </PreferenceCategory>
-
 </PreferenceScreen>
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index 912fda752bd..c5cafe0b948 100644
--- a/res/xml/power_usage_summary.xml
+++ b/res/xml/power_usage_summary.xml
@@ -37,11 +37,7 @@
         android:key="battery_help_message"
         android:layout="@layout/preference_battery_error"
         android:selectable="false"
-        settings:searchable="false">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://support.google.com/pixelphone/?p=p4xl_battery" />
-    </com.android.settingslib.widget.LayoutPreference>
+        settings:searchable="false" />
 
     <com.android.settings.widget.TipCardPreference
         android:key="battery_tip"
@@ -65,20 +61,11 @@
             settings:controller="com.android.settings.fuelgauge.BatterySaverController" />
 
         <Preference
-            android:key="smart_battery_manager"
-            android:title="@string/adaptive_charging_title"
             android:fragment="com.android.settings.fuelgauge.SmartBatterySettings"
-            settings:keywords="@string/keywords_battery_adaptive_preferences"
-            settings:searchable="true"
-            settings:controller="com.google.android.settings.fuelgauge.adaptivecharging.AdaptiveChargingPreferenceController" />
-
-        <Preference
-            android:key="reverse_charging"
-            android:title="@string/reverse_charging_title"
-            android:fragment="com.google.android.settings.fuelgauge.reversecharging.ReverseChargingDashboardFragment"
-            settings:keywords="@string/keywords_battery_share_settings"
-            settings:searchable="true"
-            settings:controller="com.google.android.settings.fuelgauge.reversecharging.ReverseChargingPreferenceController" />
+            android:key="smart_battery_manager"
+            android:title="@string/smart_battery_manager_title"
+            settings:controller="com.android.settings.fuelgauge.batterytip.BatteryManagerPreferenceController"
+            settings:keywords="@string/keywords_battery_adaptive_preferences" />
     </PreferenceCategory>
 
     <Preference
diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
index 64d54e57474..c7911249c8e 100644
--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
@@ -36,12 +36,6 @@
             android:fragment="com.android.settings.notification.LockScreenNotificationsPreferencePageFragment"
             settings:controller="com.android.settings.notification.LockScreenNotificationsPreferencePageController" />
 
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="enable_glanceable_hub_toggle"
-            android:title="@string/enable_glanceable_hub_toggle"
-            android:summary="@string/enable_glanceable_hub_toggle_summary"
-            settings:controller="com.google.android.settings.communal.GlanceableHubTogglePreferenceController"/>
-
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="security_display_lockscreen_bypass"
             android:title="@string/lockscreen_bypass_title"
@@ -95,7 +89,6 @@
             android:title="@string/lockscreen_double_line_clock_setting_toggle"
             android:summary="@string/lockscreen_double_line_clock_summary"
             settings:controller="com.android.settings.display.LockscreenClockPreferenceController" />
-
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/smart_battery_detail.xml b/res/xml/smart_battery_detail.xml
index c01e02f24fa..8fdd3a5995b 100644
--- a/res/xml/smart_battery_detail.xml
+++ b/res/xml/smart_battery_detail.xml
@@ -24,15 +24,7 @@
 
     <com.android.settingslib.widget.IllustrationPreference
         android:key="auto_awesome_battery"
-        android:selectable="false"
-        settings:lottie_rawRes="@raw/lottie_adaptive_battery"
-        settings:searchable="false" />
-
-    <com.android.settingslib.widget.MainSwitchPreference
-        android:key="adaptive_charging_switch"
-        android:title="@string/adaptive_charging_main_switch_title"
-        settings:controller="com.google.android.settings.fuelgauge.adaptivecharging.AdaptiveChargingMainSwitchPreferenceController"
-        settings:keywords="@string/keywords_adaptive_charging"/>
+        settings:lottie_rawRes="@raw/auto_awesome_battery_lottie" />
 
     <SwitchPreferenceCompat
         android:key="smart_battery"
@@ -51,8 +43,8 @@
         android:title="@string/restricted_app_title"/>
 
     <com.android.settingslib.widget.FooterPreference
-        android:key="adaptive_charging_footer_preference"
-        android:title="@string/adaptive_charging_footer"
-        settings:controller="com.google.android.settings.fuelgauge.adaptivecharging.AdaptiveChargingFooterPreferenceController"
-        settings:searchable="false" />
+        android:key="smart_battery_detail_footer"
+        android:title="@string/smart_battery_footer"
+        android:selectable="false"
+        settings:searchable="false"/>
 </PreferenceScreen>
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index f204f605c05..44e966d5e39 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -225,15 +225,7 @@
         android:title="@string/app_volume_title"
         android:summary="@string/app_volume_summary"
         android:defaultValue="false"
-        android:order="-58"/>
-
-    <Preference
-        android:key="clear_calling"
-        android:title="@string/clear_calling_title"
-        android:summary="@string/clear_calling_topintro"
-        android:fragment="com.google.android.settings.notification.ClearCallingSettings"
-        settings:controller="com.google.android.settings.notification.ClearCallingPreferenceController"
-        android:order="-55"/>
+        android:order="-5"/>
 
     <!-- Dial pad tones -->
     <SwitchPreferenceCompat
diff --git a/res/xml/spatial_audio_settings.xml b/res/xml/spatial_audio_settings.xml
index aa18d7a29f7..7355f98d376 100644
--- a/res/xml/spatial_audio_settings.xml
+++ b/res/xml/spatial_audio_settings.xml
@@ -24,12 +24,6 @@
         android:title="@string/spatial_audio_text"
         settings:searchable="false"/>
 
-    <com.android.settingslib.widget.ButtonPreference
-        android:icon="@drawable/ic_lightbulb_tips"
-        android:key="discover_tips"
-        android:title="@string/discover_tips_button"
-        settings:controller="com.google.android.settings.notification.SpatialAudioTipsButtonPreferenceController" />
-
     <SwitchPreferenceCompat
         android:key="spatial_audio"
         android:title="@string/spatial_audio_speaker"
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index 4714aa36112..f3a5f3216c7 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -46,12 +46,6 @@
         settings:searchable="false"
         settings:controller="com.android.settings.enterprise.ManageDeviceAdminPreferenceController" />
 
-    <Preference
-        android:key="debugging_data"
-        android:order="-1650"
-        android:title="@string/debugging_data_title"
-        settings:controller="com.google.android.settings.applications.specialaccess.DebuggingDataPreferenceController" />
-
     <Preference
         android:key="system_alert_window_app_list"
         android:title="@string/system_alert_window_settings"
diff --git a/res/xml/vpn_settings2.xml b/res/xml/vpn_settings2.xml
index 203deb16331..0d374c75518 100644
--- a/res/xml/vpn_settings2.xml
+++ b/res/xml/vpn_settings2.xml
@@ -15,15 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="@string/vpn_title">
-
-    <com.android.settingslib.widget.ButtonPreference
-        android:icon="@drawable/ic_lightbulb_tips"
-        android:key="discover_tips"
-        android:title="@string/discover_tips_button"
-        settings:controller="com.google.android.settings.network.VpnSettings2TipsButtonPreferenceController" />
-
     <PreferenceCategory
         android:key="advanced_vpn_group"/>