diff --git a/universal7885-common/rro_overlays/NotchBarKiller/Android.bp b/universal7885-common/rro_overlays/NotchBarKiller/Android.bp
deleted file mode 100644
index 3b13c6d..0000000
--- a/universal7885-common/rro_overlays/NotchBarKiller/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (C) 2020 Paranoid Android
-//
-// 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.
-
-runtime_resource_overlay {
-    name: "NotchBarKiller",
-    sdk_version: "current",
-    product_specific: true,
-}
diff --git a/universal7885-common/rro_overlays/NotchBarKiller/AndroidManifest.xml b/universal7885-common/rro_overlays/NotchBarKiller/AndroidManifest.xml
deleted file mode 100644
index 65b287c..0000000
--- a/universal7885-common/rro_overlays/NotchBarKiller/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-  ~ Copyright (C) 2018 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.
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.internal.display.cutout.emulation.NotchBarKiller"
-        android:versionCode="1"
-        android:versionName="1.0">
-    <overlay android:targetPackage="android"
-            android:category="com.android.internal.display_cutout_emulation"
-            android:priority="850"/>
-
-    <application android:label="@string/display_cutout_emulation_overlay" android:hasCode="false"/>
-</manifest>
diff --git a/universal7885-common/rro_overlays/NotchBarKiller/res/values/config.xml b/universal7885-common/rro_overlays/NotchBarKiller/res/values/config.xml
deleted file mode 100644
index 9ef55cc..0000000
--- a/universal7885-common/rro_overlays/NotchBarKiller/res/values/config.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-  ~ Copyright (C) 2018 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.
-  -->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <!-- Whether the display cutout region of the main built-in display should be forced to
-         black in software (to avoid aliasing or emulate a cutout that is not physically existent).
-     -->
-    <bool name="config_fillMainBuiltInDisplayCutout">true</bool>
-
-    <string translatable="false" name="config_mainBuiltInDisplayCutout">M 0,0 L 0, 0 C 0,0 0,0 0,0</string>
-    <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">@*android:string/config_mainBuiltInDisplayCutout</string>
-
-    <!-- Max visible notification icons -->
-    <integer name="config_maxVisibleNotificationIcons">4</integer>
-    <integer name="config_maxVisibleNotificationIconsWhenDark">5</integer>
-
-</resources>
diff --git a/universal7885-common/rro_overlays/NotchBarKiller/res/values/strings.xml b/universal7885-common/rro_overlays/NotchBarKiller/res/values/strings.xml
deleted file mode 100644
index e105f42..0000000
--- a/universal7885-common/rro_overlays/NotchBarKiller/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="display_cutout_emulation_overlay">Notch Bar Killer</string>
-</resources>
diff --git a/universal7885-common/rro_overlays/VShapedNotch/Android.bp b/universal7885-common/rro_overlays/VShapedNotch/Android.bp
deleted file mode 100644
index 5fdb173..0000000
--- a/universal7885-common/rro_overlays/VShapedNotch/Android.bp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (C) 2020 Paranoid Android
-//
-// 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.
-
-runtime_resource_overlay {
-    name: "VShapedNotch",
-    sdk_version: "current",
-    product_specific: true,
-}
diff --git a/universal7885-common/rro_overlays/VShapedNotch/AndroidManifest.xml b/universal7885-common/rro_overlays/VShapedNotch/AndroidManifest.xml
deleted file mode 100644
index 10b23e5..0000000
--- a/universal7885-common/rro_overlays/VShapedNotch/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.internal.display.cutout.emulation.violet"
-        android:versionCode="1"
-        android:versionName="1.0">
-    <overlay android:targetPackage="android"
-            android:category="com.android.internal.display_cutout_emulation"
-            android:priority="1"/>
-
-    <application android:label="V-Shaped" android:hasCode="false"/>
-</manifest>
diff --git a/universal7885-common/rro_overlays/VShapedNotch/res/values/bools.xml b/universal7885-common/rro_overlays/VShapedNotch/res/values/bools.xml
deleted file mode 100644
index 97b09ea..0000000
--- a/universal7885-common/rro_overlays/VShapedNotch/res/values/bools.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-<bool name="config_fillMainBuiltInDisplayCutout">true</bool>
-</resources>
diff --git a/universal7885-common/rro_overlays/VShapedNotch/res/values/dimens.xml b/universal7885-common/rro_overlays/VShapedNotch/res/values/dimens.xml
deleted file mode 100644
index 5d0a69a..0000000
--- a/universal7885-common/rro_overlays/VShapedNotch/res/values/dimens.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-<dimen name="status_bar_height_portrait">30.0dip</dimen>
-<dimen name="status_bar_height_landscape">28.0dip</dimen>
-<dimen name="quick_qs_offset_height">32.0dip</dimen>
-<dimen name="quick_qs_total_height">176.0dip</dimen>
-</resources>
diff --git a/universal7885-common/rro_overlays/VShapedNotch/res/values/public.xml b/universal7885-common/rro_overlays/VShapedNotch/res/values/public.xml
deleted file mode 100644
index 5427388..0000000
--- a/universal7885-common/rro_overlays/VShapedNotch/res/values/public.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-<public type="string" name="config_mainBuiltInDisplayCutout" id="0x7f020000" />
-<public type="string" name="display_cutout_emulation_overlay" id="0x7f020002" />
-<public type="string" name="dummy_ae_1" id="0x7f020001" />
-<public type="bool" name="config_fillMainBuiltInDisplayCutout" id="0x7f030000" />
-<public type="dimen" name="status_bar_height_portrait" id="0x7f040000" />
-<public type="dimen" name="status_bar_height_landscape" id="0x7f040001" />
-<public type="dimen" name="quick_qs_offset_height" id="0x7f040002" />
-<public type="dimen" name="quick_qs_total_height" id="0x7f040003" />
-</resources>
diff --git a/universal7885-common/rro_overlays/VShapedNotch/res/values/strings.xml b/universal7885-common/rro_overlays/VShapedNotch/res/values/strings.xml
deleted file mode 100644
index 6fa4f1d..0000000
--- a/universal7885-common/rro_overlays/VShapedNotch/res/values/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-<string name="config_mainBuiltInDisplayCutout">M-185,0 H183.34 c-9.77.44-19.57,0.08-29.28,1.24-20.33,1.14-41.18,5.17-58.62,16.24 C78.54,28.27,66,44.26,52,58.29 a72.73,72.73,0,0,1-38.29,19.58 c-16.53,2.51-34,1-49.09-6.62-9.85-4.62-17.88-12.24-25.21-20.18-10.46-11.27-20.9-22.75-33.53-31.66-11.49-8-24.9-12.78-38.53-15.42 C-149.92,0.81,-167.51.39,-185,0Z</string>
-<string name="display_cutout_emulation_overlay">Violet Cutout</string>
-<item type="string" name="dummy_ae_1">false</item>
-</resources>
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 5a985ef..c64e293 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -248,11 +248,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt
 
-# Notch
-PRODUCT_PACKAGES += \
-    NotchBarKiller \
-    VShapedNotch
-
 # RIL
 PRODUCT_PACKAGES += \
     android.hardware.radio@1.2.vendor \