diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6308071..41119df 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -16,9 +16,7 @@ TARGET_BOOTLOADER_BOARD_NAME := milanf
 
 # HIDL
 DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml
-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_SKUS += dn n
 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 c50f9da..85cac18 100644
--- a/device.mk
+++ b/device.mk
@@ -66,15 +66,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \
     frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml
 
-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)
-
 # Sensors
 PRODUCT_PACKAGES += \
     sensors.milanf
diff --git a/permissions/unavail.android.hardware.nfc.hce.xml b/permissions/unavail.android.hardware.nfc.hce.xml
deleted file mode 100644
index d51b477..0000000
--- a/permissions/unavail.android.hardware.nfc.hce.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <unavailable-feature name="android.hardware.nfc.hce"/>
-</permissions>
diff --git a/permissions/unavail.android.hardware.nfc.hcef.xml b/permissions/unavail.android.hardware.nfc.hcef.xml
deleted file mode 100644
index 52dfb76..0000000
--- a/permissions/unavail.android.hardware.nfc.hcef.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <unavailable-feature name="android.hardware.nfc.hcef"/>
-</permissions>
diff --git a/permissions/unavail.android.hardware.nfc.uicc.xml b/permissions/unavail.android.hardware.nfc.uicc.xml
deleted file mode 100644
index bbf821d..0000000
--- a/permissions/unavail.android.hardware.nfc.uicc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <unavailable-feature name="android.hardware.nfc.uicc"/>
-</permissions>
diff --git a/permissions/unavail.android.hardware.nfc.xml b/permissions/unavail.android.hardware.nfc.xml
deleted file mode 100644
index 62f0548..0000000
--- a/permissions/unavail.android.hardware.nfc.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <unavailable-feature name="android.hardware.nfc"/>
-    <unavailable-feature name="android.hardware.nfc.any"/>
-</permissions>
diff --git a/sku/manifest_b.xml b/sku/manifest_b.xml
deleted file mode 100644
index e727057..0000000
--- a/sku/manifest_b.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
-    Input:
-        manifest_b.xml
--->
-<manifest version="2.0" type="device">
-    <hal format="hidl" override="true">
-        <name>android.hardware.nfc</name>
-        <transport>hwbinder</transport>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>android.hardware.radio</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::ISap/slot1</fqname>
-        <fqname>@1.5::IRadio/slot1</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>android.hardware.secure_element</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::ISecureElement/SIM1</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.data.connection</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.1::IDataConnection/slot1</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.data.iwlan</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.0::IIWlan/slot1</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.radio.am</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.0::IQcRilAudio/slot1</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.radio.ims</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.7::IImsRadio/imsradio0</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.radio.lpa</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.1::IUimLpa/UimLpa0</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.radio.qcrilhook</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.0::IQtiOemHook/oemhook0</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.radio.qtiradio</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.0::IQtiRadio/slot1</fqname>
-        <fqname>@2.7::IQtiRadio/slot1</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.radio.uim</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::IUim/Uim0</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.radio.uim_remote_client</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.0::IUimRemoteServiceClient/uimRemoteClient0</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>vendor.qti.hardware.radio.uim_remote_server</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.0::IUimRemoteServiceServer/uimRemoteServer0</fqname>
-    </hal>
-</manifest>
diff --git a/sku/manifest_d.xml b/sku/manifest_d.xml
deleted file mode 100644
index c5701b6..0000000
--- a/sku/manifest_d.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-    Input:
-        manifest_d.xml
--->
-<manifest version="2.0" type="device">
-    <hal format="hidl" override="true">
-        <name>android.hardware.nfc</name>
-        <transport>hwbinder</transport>
-    </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/SIM2</fqname>
-    </hal>
-</manifest>
diff --git a/sku/manifest_dn.xml b/sku/manifest_dn.xml
index bc05a87..6fc9fa6 100644
--- a/sku/manifest_dn.xml
+++ b/sku/manifest_dn.xml
@@ -6,11 +6,22 @@
     <hal format="hidl" override="true">
         <name>android.hardware.nfc</name>
         <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>INfc</name>
+            <instance>default</instance>
+        </interface>
         <fqname>@1.2::INfc/default</fqname>
     </hal>
     <hal format="hidl" override="true">
         <name>android.hardware.secure_element</name>
         <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>ISecureElement</name>
+            <instance>SIM1</instance>
+            <instance>SIM2</instance>
+        </interface>
         <fqname>@1.2::ISecureElement/SIM1</fqname>
         <fqname>@1.2::ISecureElement/SIM2</fqname>
     </hal>
diff --git a/sku/manifest_n.xml b/sku/manifest_n.xml
index 954cc85..73cc995 100644
--- a/sku/manifest_n.xml
+++ b/sku/manifest_n.xml
@@ -6,68 +6,134 @@
     <hal format="hidl" override="true">
         <name>android.hardware.nfc</name>
         <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>INfc</name>
+            <instance>default</instance>
+        </interface>
         <fqname>@1.2::INfc/default</fqname>
     </hal>
     <hal format="hidl" override="true">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>
+        <version>1.5</version>
+        <interface>
+            <name>IRadio</name>
+            <instance>slot1</instance>
+        </interface>
         <fqname>@1.2::ISap/slot1</fqname>
         <fqname>@1.5::IRadio/slot1</fqname>
     </hal>
     <hal format="hidl" override="true">
         <name>android.hardware.secure_element</name>
         <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>ISecureElement</name>
+            <instance>SIM1</instance>
+        </interface>
         <fqname>@1.2::ISecureElement/SIM1</fqname>
     </hal>
     <hal format="hidl" override="true">
         <name>vendor.qti.hardware.data.connection</name>
         <transport>hwbinder</transport>
+        <version>1.1</version>
+        <interface>
+            <name>IDataConnection</name>
+            <instance>slot1</instance>
+        </interface>
         <fqname>@1.1::IDataConnection/slot1</fqname>
     </hal>
     <hal format="hidl" override="true">
         <name>vendor.qti.hardware.data.iwlan</name>
         <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IIWlan</name>
+            <instance>slot1</instance>
+        </interface>
         <fqname>@1.0::IIWlan/slot1</fqname>
     </hal>
     <hal format="hidl" override="true">
         <name>vendor.qti.hardware.radio.am</name>
         <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IQcRilAudio</name>
+            <instance>slot1</instance>
+        </interface>
         <fqname>@1.0::IQcRilAudio/slot1</fqname>
     </hal>
     <hal format="hidl" override="true">
         <name>vendor.qti.hardware.radio.ims</name>
         <transport>hwbinder</transport>
+        <version>1.7</version>
+        <interface>
+            <name>IImsRadio</name>
+            <instance>imsradio0</instance>
+        </interface>
         <fqname>@1.7::IImsRadio/imsradio0</fqname>
     </hal>
     <hal format="hidl" override="true">
         <name>vendor.qti.hardware.radio.lpa</name>
         <transport>hwbinder</transport>
+        <version>1.1</version>
+        <interface>
+            <name>IUimLpa</name>
+            <instance>UimLpa0</instance>
+        </interface>
         <fqname>@1.1::IUimLpa/UimLpa0</fqname>
     </hal>
     <hal format="hidl" override="true">
         <name>vendor.qti.hardware.radio.qcrilhook</name>
         <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IQtiOemHook</name>
+            <instance>oemhook0</instance>
+        </interface>
         <fqname>@1.0::IQtiOemHook/oemhook0</fqname>
     </hal>
     <hal format="hidl" override="true">
         <name>vendor.qti.hardware.radio.qtiradio</name>
         <transport>hwbinder</transport>
+        <version>1.0</version>
+        <version>2.7</version>
+        <interface>
+            <name>IQtiRadio</name>
+            <instance>slot1</instance>
+        </interface>
         <fqname>@1.0::IQtiRadio/slot1</fqname>
         <fqname>@2.7::IQtiRadio/slot1</fqname>
     </hal>
     <hal format="hidl" override="true">
         <name>vendor.qti.hardware.radio.uim</name>
         <transport>hwbinder</transport>
+        <version>1.2</version>
+        <interface>
+            <name>IUim</name>
+            <instance>Uim0</instance>
+        </interface>
         <fqname>@1.2::IUim/Uim0</fqname>
     </hal>
     <hal format="hidl" override="true">
         <name>vendor.qti.hardware.radio.uim_remote_client</name>
         <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IUimRemoteServiceClient</name>
+            <instance>uimRemoteClient0</instance>
+        </interface>
         <fqname>@1.0::IUimRemoteServiceClient/uimRemoteClient0</fqname>
     </hal>
     <hal format="hidl" override="true">
         <name>vendor.qti.hardware.radio.uim_remote_server</name>
         <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IUimRemoteServiceServer</name>
+            <instance>uimRemoteServer0</instance>
+        </interface>
         <fqname>@1.0::IUimRemoteServiceServer/uimRemoteServer0</fqname>
     </hal>
 </manifest>