diff --git a/BoardConfig.mk b/BoardConfig.mk
index 75bf23e..b287bf5 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -12,10 +12,9 @@ include device/motorola/sm6375-common/BoardConfigCommon.mk
 TARGET_BOOTLOADER_BOARD_NAME := rhodep
 
 # HIDL
-ODM_MANIFEST_SKUS += b d de dn n
+ODM_MANIFEST_SKUS += b d dn n
 ODM_MANIFEST_B_FILES := $(DEVICE_PATH)/sku/manifest_b.xml
 ODM_MANIFEST_D_FILES := $(DEVICE_PATH)/sku/manifest_d.xml
-ODM_MANIFEST_DE_FILES := $(DEVICE_PATH)/sku/manifest_de.xml
 ODM_MANIFEST_DN_FILES := $(DEVICE_PATH)/sku/manifest_dn.xml
 ODM_MANIFEST_N_FILES := $(DEVICE_PATH)/sku/manifest_n.xml
 
diff --git a/device.mk b/device.mk
index 4b7161b..3e20173 100644
--- a/device.mk
+++ b/device.mk
@@ -64,27 +64,14 @@ PRODUCT_COPY_FILES += \
     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 f
+DEVICE_SKUS := b d
 
 PRODUCT_COPY_FILES += \
 $(foreach DEVICE_SKU, $(DEVICE_SKUS), \
     $(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.hce.xml \
     $(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.hcef.xml \
     $(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.uicc.xml \
-    $(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.xml \
-    $(LOCAL_PATH)/permissions/unavail.android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.se.omapi.ese.xml)
-
-ESE_DEVICE_SKUS := de
-
-PRODUCT_COPY_FILES += \
-$(foreach DEVICE_SKU, $(ESE_DEVICE_SKUS), \
-    frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(ESE_DEVICE_SKU)/android.hardware.se.omapi.ese.xml)
-
-NFC_DEVICE_SKUS := dn n
-
-PRODUCT_COPY_FILES += \
-$(foreach DEVICE_SKU, $(NFC_DEVICE_SKUS), \
-    $(LOCAL_PATH)/permissions/unavail.android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.se.omapi.ese.xml)
+    $(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.xml)
 
 # Sensors
 PRODUCT_PACKAGES += \
diff --git a/permissions/unavail.android.hardware.se.omapi.ese.xml b/permissions/unavail.android.hardware.se.omapi.ese.xml
deleted file mode 100644
index 66bf79d..0000000
--- a/permissions/unavail.android.hardware.se.omapi.ese.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <unavailable-feature name="android.hardware.se.omapi.ese"/>
-</permissions>
diff --git a/sku/manifest_b.xml b/sku/manifest_b.xml
index bbcba83..e727057 100644
--- a/sku/manifest_b.xml
+++ b/sku/manifest_b.xml
@@ -18,10 +18,6 @@
         <transport>hwbinder</transport>
         <fqname>@1.2::ISecureElement/SIM1</fqname>
     </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.esepowermanager</name>
-        <transport>hwbinder</transport>
-    </hal>
     <hal format="hidl" override="true">
         <name>vendor.qti.hardware.data.connection</name>
         <transport>hwbinder</transport>
@@ -32,10 +28,6 @@
         <transport>hwbinder</transport>
         <fqname>@1.0::IIWlan/slot1</fqname>
     </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.qteeconnector</name>
-        <transport>hwbinder</transport>
-    </hal>
     <hal format="hidl" override="true">
         <name>vendor.qti.hardware.radio.am</name>
         <transport>hwbinder</transport>
diff --git a/sku/manifest_d.xml b/sku/manifest_d.xml
index ed3baf7..c5701b6 100644
--- a/sku/manifest_d.xml
+++ b/sku/manifest_d.xml
@@ -13,12 +13,4 @@
         <fqname>@1.2::ISecureElement/SIM1</fqname>
         <fqname>@1.2::ISecureElement/SIM2</fqname>
     </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.esepowermanager</name>
-        <transport>hwbinder</transport>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.qteeconnector</name>
-        <transport>hwbinder</transport>
-    </hal>
 </manifest>
diff --git a/sku/manifest_de.xml b/sku/manifest_de.xml
deleted file mode 100644
index 74ccb64..0000000
--- a/sku/manifest_de.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-    Input:
-        manifest_de.xml
--->
-<manifest version="2.0" type="device">
-    <hal format="hidl" override="true">
-        <name>android.hardware.nfc</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::INfc/default</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>android.hardware.secure_element</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::ISecureElement/SIM1</fqname>
-        <fqname>@1.2::ISecureElement/eSE1</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.esepowermanager</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.1::IEsePowerManager/default</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.qteeconnector</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.0::IAppConnector/default</fqname>
-        <fqname>@1.0::IGPAppConnector/default</fqname>
-    </hal>
-</manifest>
diff --git a/sku/manifest_dn.xml b/sku/manifest_dn.xml
index bed8b21..bc05a87 100644
--- a/sku/manifest_dn.xml
+++ b/sku/manifest_dn.xml
@@ -14,12 +14,4 @@
         <fqname>@1.2::ISecureElement/SIM1</fqname>
         <fqname>@1.2::ISecureElement/SIM2</fqname>
     </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.esepowermanager</name>
-        <transport>hwbinder</transport>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.qteeconnector</name>
-        <transport>hwbinder</transport>
-    </hal>
 </manifest>
diff --git a/sku/manifest_n.xml b/sku/manifest_n.xml
index e63e746..954cc85 100644
--- a/sku/manifest_n.xml
+++ b/sku/manifest_n.xml
@@ -19,10 +19,6 @@
         <transport>hwbinder</transport>
         <fqname>@1.2::ISecureElement/SIM1</fqname>
     </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.esepowermanager</name>
-        <transport>hwbinder</transport>
-    </hal>
     <hal format="hidl" override="true">
         <name>vendor.qti.hardware.data.connection</name>
         <transport>hwbinder</transport>
@@ -33,10 +29,6 @@
         <transport>hwbinder</transport>
         <fqname>@1.0::IIWlan/slot1</fqname>
     </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.qteeconnector</name>
-        <transport>hwbinder</transport>
-    </hal>
     <hal format="hidl" override="true">
         <name>vendor.qti.hardware.radio.am</name>
         <transport>hwbinder</transport>