diff --git a/device.mk b/device.mk
index 3e20173..69fbf9a 100644
--- a/device.mk
+++ b/device.mk
@@ -25,7 +25,6 @@ $(call inherit-product, device/motorola/sm6375-common/common.mk)
 PRODUCT_PACKAGES += \
     FrameworksResDevice \
     LineageSystemUIDevice \
-    ProductFrameworksResDevice \
     SettingsResDevice \
     SystemUIResDevice \
     WifiResDevice
@@ -61,7 +60,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \
     frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \
     frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
-    frameworks/native/data/etc/android.hardware.telephony.euicc.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.xml \
     frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml
 
 DEVICE_SKUS := b d
diff --git a/product.prop b/product.prop
index 5d31150..acd8440 100644
--- a/product.prop
+++ b/product.prop
@@ -1,7 +1,3 @@
-# e-SIM
-masterclear.allow_retain_esim_profiles_after_fdr=true
-ro.telephony.esim_slot_id=1
-
 # Google
 ro.opa.device_model_id=motorola-rhodep
 
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 7d3251d..43e138c 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -228,11 +228,6 @@ vendor/etc/qdcm_calib_data_mipi_moto_vid_csot_1080p_dsc_655.xml
 vendor/etc/qdcm_calib_data_mipi_moto_vid_tm_1080p_dsc_655.xml
 vendor/etc/qdcm_calib_data_mipi_moto_vid_tm_u8_1080p_dsc_655.xml
 
-# Euicc
-product/app/EuiccPartnerApp/EuiccPartnerApp.apk
-product/etc/permissions/privapp-permissions-com.google.android.euicc.xml
-product/priv-app/EuiccGoogle/EuiccGoogle.apk
-
 # Fingerprint
 vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-ets
 vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-ets.rc
diff --git a/resource-overlay/device/ProductFrameworks/Android.bp b/resource-overlay/device/ProductFrameworks/Android.bp
deleted file mode 100644
index 6962cff..0000000
--- a/resource-overlay/device/ProductFrameworks/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// SPDX-FileCopyrightText: The LineageOS Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "ProductFrameworksResDevice",
-    product_specific: true,
-}
diff --git a/resource-overlay/device/ProductFrameworks/AndroidManifest.xml b/resource-overlay/device/ProductFrameworks/AndroidManifest.xml
deleted file mode 100644
index 508822b..0000000
--- a/resource-overlay/device/ProductFrameworks/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.overlay.product.device">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="600"
-        android:targetPackage="android" />
-</manifest>
diff --git a/resource-overlay/device/ProductFrameworks/res/values/arrays.xml b/resource-overlay/device/ProductFrameworks/res/values/arrays.xml
deleted file mode 100644
index cbe4d9c..0000000
--- a/resource-overlay/device/ProductFrameworks/res/values/arrays.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources>
-    <!-- Device-specific array of SIM slot indexes which are are embedded eUICCs.
-         e.g. If a device has two physical slots with indexes 0, 1, and slot 1 is an
-         eUICC, then the value of this array should be:
-             <integer-array name="non_removable_euicc_slots">
-                 <item>1</item>
-             </integer-array>
-         If a device has three physical slots and slot 1 and 2 are eUICCs, then the value of
-         this array should be:
-             <integer-array name="non_removable_euicc_slots">
-                <item>1</item>
-                <item>2</item>
-             </integer-array>
-         This is used to differentiate between removable eUICCs and built in eUICCs, and should
-         be set by OEMs for devices which use eUICCs. -->
-    <integer-array name="non_removable_euicc_slots">
-        <item>1</item>
-    </integer-array>
-</resources>
diff --git a/resource-overlay/device/ProductFrameworks/res/values/config.xml b/resource-overlay/device/ProductFrameworks/res/values/config.xml
deleted file mode 100644
index 0e528af..0000000
--- a/resource-overlay/device/ProductFrameworks/res/values/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources>
-    <!-- An array of device capabilities defined by GSMA SGP.22 v2.0.
-         The first item is the capability name that the device supports. The second item is the
-         major version. The minor and revision versions are default to 0s.
-         The device capabilities and their definition in the spec are:
-             gsm : gsmSupportedRelease
-             utran : utranSupportedRelease
-             cdma1x : cdma2000onexSupportedRelease
-             hrpd : cdma2000hrpdSupportedRelease
-             ehrpd : cdma2000ehrpdSupportedRelease
-             eutran : eutranSupportedRelease
-             nfc : contactlessSupportedRelease
-             crl : rspCrlSupportedVersion
-             nrepc : nrEpcSupportedRelease
-             nr5gc : nr5gcSupportedRelease
-             eutran5gc : eutran5gcSupportedRelease
-    -->
-    <string-array name="config_telephonyEuiccDeviceCapabilities" translatable="false">
-        <item>gsm,9</item>
-        <item>utran,9</item>
-        <item>eutran,15</item>
-    </string-array>
-</resources>