diff --git a/common.mk b/common.mk
index 57b9bde..ddca171 100644
--- a/common.mk
+++ b/common.mk
@@ -394,12 +394,10 @@ PRODUCT_PACKAGES += \
 # WiFi
 PRODUCT_PACKAGES += \
     android.hardware.wifi-service \
-    ConnectivityOverlay \
     firmware_WCNSS_qcom_cfg.ini_symlink \
     hostapd \
     libwifi-hal-qcom \
     libwpa_client \
-    SoftapOverlay \
     TetheringConfigOverlay \
     WifiOverlay \
     wpa_supplicant \
diff --git a/rro_overlays/ConnectivityOverlay/Android.bp b/rro_overlays/ConnectivityOverlay/Android.bp
deleted file mode 100644
index ef4e0a1..0000000
--- a/rro_overlays/ConnectivityOverlay/Android.bp
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// Copyright (C) 2024 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-runtime_resource_overlay {
-    name: "ConnectivityOverlay",
-    vendor: true
-}
diff --git a/rro_overlays/ConnectivityOverlay/AndroidManifest.xml b/rro_overlays/ConnectivityOverlay/AndroidManifest.xml
deleted file mode 100644
index 934128f..0000000
--- a/rro_overlays/ConnectivityOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<!-- Pixel specific connectivity overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.connectivity.resources.overlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.connectivity.resources"
-      android:targetName="ServiceConnectivityResourcesConfig"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
diff --git a/rro_overlays/ConnectivityOverlay/res/values/config.xml b/rro_overlays/ConnectivityOverlay/res/values/config.xml
deleted file mode 100644
index 1842bc4..0000000
--- a/rro_overlays/ConnectivityOverlay/res/values/config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-    <!-- If the hardware supports specially marking packets that caused a wakeup of the
-         main CPU, set this value to the mark used. -->
-    <integer translatable="false" name="config_networkWakeupPacketMark">0x80000000</integer>
-
-    <!-- Mask to use when checking skb mark defined in config_networkWakeupPacketMark above. -->
-    <integer translatable="false" name="config_networkWakeupPacketMask">0x80000000</integer>
-</resources>
diff --git a/rro_overlays/SoftapOverlay/Android.bp b/rro_overlays/SoftapOverlay/Android.bp
deleted file mode 100644
index 7488833..0000000
--- a/rro_overlays/SoftapOverlay/Android.bp
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// Copyright (C) 2024 The LineageOS Project
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "SoftapOverlay",
-    theme: "SoftapOverlay",
-    vendor: true
-}
diff --git a/rro_overlays/SoftapOverlay/AndroidManifest.xml b/rro_overlays/SoftapOverlay/AndroidManifest.xml
deleted file mode 100644
index 6b33426..0000000
--- a/rro_overlays/SoftapOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<!-- Samsung specific wifi overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    coreApp="true"
-    package="com.android.wifi.softap.resources.samsung_sm7150"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.wifi.softap.resources"
-      android:targetName="WifiCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
diff --git a/rro_overlays/SoftapOverlay/res/values/bools.xml b/rro_overlays/SoftapOverlay/res/values/bools.xml
deleted file mode 100644
index a01ae62..0000000
--- a/rro_overlays/SoftapOverlay/res/values/bools.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-    <bool name="config_wifiSofapClientForceDisconnectSupported">false</bool>
-    <bool name="config_wifiSoftApDynamicCountryCodeUpdateSupported">true</bool>
-    <bool name="config_wifiSoftapAutoAppendLowerBandsToBandConfigurationEnabled">false</bool>
-    <bool name="config_wifiSoftapAutoUpgradeToBridgedConfigWhenSupported">false</bool>
-    <bool name="config_wifiSoftapPassphraseAsciiEncodableCheck">false</bool>
-    <bool name="config_wifiSoftapResetChannelConfig">false</bool>
-    <bool name="config_wifiSoftapResetHiddenConfig">false</bool>
-    <bool name="config_wifiSoftapResetMaxClientSettingConfig">false</bool>
-    <bool name="config_wifi_softap_acs_supported">true</bool>
-</resources>
diff --git a/rro_overlays/SoftapOverlay/res/values/integers.xml b/rro_overlays/SoftapOverlay/res/values/integers.xml
deleted file mode 100644
index 0fb4482..0000000
--- a/rro_overlays/SoftapOverlay/res/values/integers.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-    <integer name="config_wifiHardwareSoftapMaxClientCount">10</integer>
-</resources>
diff --git a/rro_overlays/SoftapOverlay/res/values/public.xml b/rro_overlays/SoftapOverlay/res/values/public.xml
deleted file mode 100644
index e607959..0000000
--- a/rro_overlays/SoftapOverlay/res/values/public.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-    <public type="bool" name="config_wifiSofapClientForceDisconnectSupported" id="0x7f010000" />
-    <public type="bool" name="config_wifiSoftApDynamicCountryCodeUpdateSupported" id="0x7f010001" />
-    <public type="bool" name="config_wifiSoftapAutoAppendLowerBandsToBandConfigurationEnabled" id="0x7f010002" />
-    <public type="bool" name="config_wifiSoftapAutoUpgradeToBridgedConfigWhenSupported" id="0x7f010003" />
-    <public type="bool" name="config_wifiSoftapPassphraseAsciiEncodableCheck" id="0x7f010004" />
-    <public type="bool" name="config_wifiSoftapResetChannelConfig" id="0x7f010005" />
-    <public type="bool" name="config_wifiSoftapResetHiddenConfig" id="0x7f010006" />
-    <public type="bool" name="config_wifiSoftapResetMaxClientSettingConfig" id="0x7f010007" />
-    <public type="bool" name="config_wifi_softap_acs_supported" id="0x7f010008" />
-    <public type="integer" name="config_wifiHardwareSoftapMaxClientCount" id="0x7f020000" />
-    <public type="string" name="config_wifiSoftap2gChannelList" id="0x7f030000" />
-    <public type="string" name="config_wifiSoftap5gChannelList" id="0x7f030001" />
-</resources>
diff --git a/rro_overlays/SoftapOverlay/res/values/strings.xml b/rro_overlays/SoftapOverlay/res/values/strings.xml
deleted file mode 100644
index 7076375..0000000
--- a/rro_overlays/SoftapOverlay/res/values/strings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2024 The LineageOS Project
- *
- * SPDX-License-Identifier: Apache-2.0
- */
--->
-<resources>
-    <string name="config_wifiSoftap2gChannelList">1-11</string>
-    <string name="config_wifiSoftap5gChannelList">149</string>
-</resources>