diff --git a/Android.bp b/Android.bp
index bde7664..7329792 100644
--- a/Android.bp
+++ b/Android.bp
@@ -493,6 +493,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/hw/hwcomposer.mtk_common.so",
             ],
             shared_libs: [
+                "libprocessgroup_shim",
                 "libutils",
                 "libcutils",
                 "liblog",
@@ -4893,32 +4894,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libforkexecwrap",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libforkexecwrap.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libformatter",
     owner: "xiaomi",
@@ -5450,32 +5425,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libifcutils_mtk",
-    owner: "xiaomi",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libifcutils_mtk.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libimagebuffer_wrapper",
     owner: "xiaomi",
@@ -10490,6 +10439,35 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libwifi-hal-mtk",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libwifi-hal-mtk.so",
+            ],
+            shared_libs: [
+                "libbase",
+                "libcutils",
+                "liblog",
+                "libnl",
+                "libutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libwifical",
     owner: "xiaomi",
@@ -34948,38 +34926,6 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
-cc_prebuilt_binary {
-    name: "netdagent",
-    owner: "xiaomi",
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/bin/netdagent",
-            ],
-            shared_libs: [
-                "libbase",
-                "libcutils",
-                "liblog",
-                "libforkexecwrap",
-                "libutils",
-                "libifcutils_mtk",
-                "libbinder_ndk",
-                "vendor.mediatek.hardware.netdagent-V1-ndk",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    strip: {
-        none: true,
-    },
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_binary {
     name: "nvram_daemon",
     owner: "xiaomi",
@@ -35585,6 +35531,7 @@ cc_prebuilt_binary {
                 "proprietary/odm/bin/hw/vendor.xiaomi.sensor.citsensorservice.aidl",
             ],
             shared_libs: [
+                "libui_shim",
                 "libhidltransport",
                 "liblog",
                 "libcutils",
diff --git a/proprietary/odm/bin/hw/vendor.xiaomi.sensor.citsensorservice.aidl b/proprietary/odm/bin/hw/vendor.xiaomi.sensor.citsensorservice.aidl
index 5e9c341..8a81b9d 100755
Binary files a/proprietary/odm/bin/hw/vendor.xiaomi.sensor.citsensorservice.aidl and b/proprietary/odm/bin/hw/vendor.xiaomi.sensor.citsensorservice.aidl differ
diff --git a/proprietary/odm/etc/init/vendor.xiaomi.sensor.citsensorservice.aidl.rc b/proprietary/odm/etc/init/vendor.xiaomi.sensor.citsensorservice.aidl.rc
index 444c162..b38ddb2 100644
--- a/proprietary/odm/etc/init/vendor.xiaomi.sensor.citsensorservice.aidl.rc
+++ b/proprietary/odm/etc/init/vendor.xiaomi.sensor.citsensorservice.aidl.rc
@@ -7,3 +7,4 @@ service citsensorservice  /odm/bin/hw/vendor.xiaomi.sensor.citsensorservice.aidl
     user system
     group system input
     writepid /proc/sys/binder_prio/cits_sensor_pid
+    task_profiles ServiceCapacityLow
diff --git a/proprietary/vendor/bin/netdagent b/proprietary/vendor/bin/netdagent
deleted file mode 100755
index f6e54e9..0000000
Binary files a/proprietary/vendor/bin/netdagent and /dev/null differ
diff --git a/proprietary/vendor/etc/ecc_list_OP01.xml b/proprietary/vendor/etc/ecc_list_OP01.xml
deleted file mode 100644
index fbd6e33..0000000
--- a/proprietary/vendor/etc/ecc_list_OP01.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<EccTable>
-    <!--
-        Configure emergency numbers for China Mobile(OP01) load. For the emergey numbers defined in
-        3GPP TS 22.101 (112/911 when SIM/USIM present and 112/911/000/08/110/118/119/999
-        when SIM/USIM not present) it will be configure in default emergency number source,
-        so no need to configure here if there is no special request for these numbers.
-
-        The attribute definition for tag EccEntry:
-        - Ecc: the emergnecy number
-        - Category: the service category (From 3GPP TS24.008)
-            - Bit 1 (1): Police
-            - Bit 2 (2): Ambulance
-            - Bit 3 (4): Fire Brigade
-            - Bit 4 (8): Marine Guard
-            - Bit 5 (16): Mountain Rescue
-            - Bit 6 (32): Manually initiated eCall
-            - Bit 7 (64): Automatically initiated eCall
-            - Bit 8 (128): is spare and set to "0"
-        - Condition: there are following values:
-            - 0: ecc only when no sim
-            - 1: ecc always
-            - 2: MMI will show ecc but send to nw as normal call
-        - Plmn: Operator PLMN which contains MCC+MNC.
-                Use FFF or FF for all operators under same country
-                Ex: 460 FFF means all operators in China
-    -->
-
-    <!-- Add for CT 2/3G network -->
-    <EccEntry Ecc="110" Category="1" Condition="1" Plmn="460 03"/>
-    <EccEntry Ecc="119" Category="4" Condition="1" Plmn="460 03"/>
-    <EccEntry Ecc="120" Category="2" Condition="1" Plmn="460 03"/>
-    <EccEntry Ecc="122" Category="8" Condition="1" Plmn="460 03"/>
-    <EccEntry Ecc="999" Category="0" Condition="1" Plmn="460 03"/>
-
-    <!-- China CTA emergency numbers for GSM operators -->
-    <EccEntry Ecc="110" Category="0" Condition="2"/>
-    <EccEntry Ecc="119" Category="0" Condition="2"/>
-    <EccEntry Ecc="120" Category="0" Condition="2"/>
-    <EccEntry Ecc="122" Category="0" Condition="2"/>
-    <!-- Support dial 999 under G+N/A case because CT network don't support
-         dial 999 without no CT SIM
-    -->
-    <EccEntry Ecc="999" Category="0" Condition="2"/>
-
-    <!-- CMCC speical requirement for 000/08/118 -->
-    <EccEntry Ecc="000" Category="0" Condition="2"/>
-    <EccEntry Ecc="08" Category="0" Condition="2"/>
-    <EccEntry Ecc="118" Category="0" Condition="2"/>
-</EccTable>
diff --git a/proprietary/vendor/etc/ecc_list_OP02.xml b/proprietary/vendor/etc/ecc_list_OP02.xml
deleted file mode 100644
index f59f1fb..0000000
--- a/proprietary/vendor/etc/ecc_list_OP02.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<EccTable>
-    <!--
-        Configure emergency numbers for China Unicom(OP02) load. For the emergey numbers defined in
-        3GPP TS 22.101 (112/911 when SIM/USIM present and 112/911/000/08/110/118/119/999
-        when SIM/USIM not present) it will be configure in default emergency number source,
-        so no need to configure here if there is no special request for these numbers.
-
-        The attribute definition for tag EccEntry:
-        - Ecc: the emergnecy number
-        - Category: the service category (From 3GPP TS24.008)
-            - Bit 1 (1): Police
-            - Bit 2 (2): Ambulance
-            - Bit 3 (4): Fire Brigade
-            - Bit 4 (8): Marine Guard
-            - Bit 5 (16): Mountain Rescue
-            - Bit 6 (32): Manually initiated eCall
-            - Bit 7 (64): Automatically initiated eCall
-            - Bit 8 (128): is spare and set to "0"
-        - Condition: there are following values:
-            - 0: ecc only when no sim
-            - 1: ecc always
-            - 2: MMI will show ecc but send to nw as normal call
-        - Plmn: Operator PLMN which contains MCC+MNC.
-                Use FFF or FF for all operators under same country
-                Ex: 460 FFF means all operators in China
-    -->
-
-    <!-- Add for CT 2/3G network -->
-    <EccEntry Ecc="110" Category="1" Condition="1" Plmn="460 03"/>
-    <EccEntry Ecc="119" Category="4" Condition="1" Plmn="460 03"/>
-    <EccEntry Ecc="120" Category="2" Condition="1" Plmn="460 03"/>
-    <EccEntry Ecc="122" Category="8" Condition="1" Plmn="460 03"/>
-    <EccEntry Ecc="999" Category="0" Condition="1" Plmn="460 03"/>
-
-    <!-- China CTA emergency numbers for GSM operators -->
-    <EccEntry Ecc="110" Category="0" Condition="2"/>
-    <EccEntry Ecc="119" Category="0" Condition="2"/>
-    <EccEntry Ecc="120" Category="0" Condition="2"/>
-    <EccEntry Ecc="122" Category="0" Condition="2"/>
-    <!-- Support dial 999 under G+N/A case because CT network don't support
-         dial 999 without no CT SIM
-    -->
-    <EccEntry Ecc="999" Category="0" Condition="2"/>
-</EccTable>
diff --git a/proprietary/vendor/etc/ecc_list_OP09.xml b/proprietary/vendor/etc/ecc_list_OP09.xml
deleted file mode 100644
index 7ccc0c0..0000000
--- a/proprietary/vendor/etc/ecc_list_OP09.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<EccTable>
-    <!--
-        Configure emergency numbers for China Telecom(OP09) load. For the emergey numbers defined in
-        3GPP TS 22.101 (112/911 when SIM/USIM present and 112/911/000/08/110/118/119/999
-        when SIM/USIM not present) it will be configure in default emergency number source,
-        so no need to configure here if there is no special request for these numbers.
-
-        The attribute definition for tag EccEntry:
-        - Ecc: the emergnecy number
-        - Category: the service category (From 3GPP TS24.008)
-            - Bit 1 (1): Police
-            - Bit 2 (2): Ambulance
-            - Bit 3 (4): Fire Brigade
-            - Bit 4 (8): Marine Guard
-            - Bit 5 (16): Mountain Rescue
-            - Bit 6 (32): Manually initiated eCall
-            - Bit 7 (64): Automatically initiated eCall
-            - Bit 8 (128): is spare and set to "0"
-        - Condition: there are following values:
-            - 0: ecc only when no sim
-            - 1: ecc always
-            - 2: MMI will show ecc but send to nw as normal call
-        - Plmn: Operator PLMN which contains MCC+MNC.
-                Use FFF or FF for all operators under same country
-                Ex: 460 FFF means all operators in China
-    -->
-
-    <!-- Add 999 for HongKong -->
-    <EccEntry Ecc="999" Category="0" Condition="1" Plmn="454 FFF"/>
-
-    <!-- Add for CT 2/3G network -->
-    <EccEntry Ecc="110" Category="1" Condition="1" Plmn="460 03"/>
-    <EccEntry Ecc="119" Category="4" Condition="1" Plmn="460 03"/>
-    <EccEntry Ecc="120" Category="2" Condition="1" Plmn="460 03"/>
-    <EccEntry Ecc="122" Category="8" Condition="1" Plmn="460 03"/>
-    <EccEntry Ecc="999" Category="0" Condition="1" Plmn="460 03"/>
-
-    <!-- China CTA emergency numbers for GSM operators -->
-    <EccEntry Ecc="110" Category="0" Condition="2"/>
-    <EccEntry Ecc="119" Category="0" Condition="2"/>
-    <EccEntry Ecc="120" Category="0" Condition="2"/>
-    <EccEntry Ecc="122" Category="0" Condition="2"/>
-    <!-- Support dial 999 under G+N/A case because CT network don't support
-         dial 999 without no CT SIM
-    -->
-    <EccEntry Ecc="999" Category="0" Condition="2"/>
-</EccTable>
diff --git a/proprietary/vendor/etc/ecc_list_OP12.xml b/proprietary/vendor/etc/ecc_list_OP12.xml
deleted file mode 100644
index 92c9417..0000000
--- a/proprietary/vendor/etc/ecc_list_OP12.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<EccTable>
-    <!--
-        Configure emergency numbers for Verizon(OP12) load. For the emergey numbers defined in
-        3GPP TS 22.101 (112/911 when SIM/USIM present and 112/911/000/08/110/118/119/999
-        when SIM/USIM not present) it will be configure in default emergency number source,
-        so no need to configure here if there is no special request for these numbers.
-
-        The attribute definition for tag EccEntry:
-        - Ecc: the emergnecy number
-        - Category: the service category (From 3GPP TS24.008)
-            - Bit 1 (1): Police
-            - Bit 2 (2): Ambulance
-            - Bit 3 (4): Fire Brigade
-            - Bit 4 (8): Marine Guard
-            - Bit 5 (16): Mountain Rescue
-            - Bit 6 (32): Manually initiated eCall
-            - Bit 7 (64): Automatically initiated eCall
-            - Bit 8 (128): is spare and set to "0"
-        - Condition: there are following values:
-            - 0: ecc only when no sim
-            - 1: ecc always
-            - 2: MMI will show ecc but send to nw as normal call
-        - Plmn: Operator PLMN which contains MCC+MNC.
-                Use FFF or FF for all operators under same country
-                Ex: 460 FFF means all operators in China
-    -->
-
-    <EccEntry Ecc="*272911" Category="0" Condition="1" />
-</EccTable>
diff --git a/proprietary/vendor/etc/ecc_list_OP17.xml b/proprietary/vendor/etc/ecc_list_OP17.xml
deleted file mode 100644
index c50f2a7..0000000
--- a/proprietary/vendor/etc/ecc_list_OP17.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<EccTable>
-    <!--
-        Configure emergency numbers for DoCoMo(OP17) load. For the emergey numbers defined in
-        3GPP TS 22.101 (112/911 when SIM/USIM present and 112/911/000/08/110/118/119/999
-        when SIM/USIM not present) it will be configure in default emergency number source,
-        so no need to configure here if there is no special request for these numbers.
-
-        The attribute definition for tag EccEntry:
-        - Ecc: the emergnecy number
-        - Category: the service category (From 3GPP TS24.008)
-            - Bit 1 (1): Police
-            - Bit 2 (2): Ambulance
-            - Bit 3 (4): Fire Brigade
-            - Bit 4 (8): Marine Guard
-            - Bit 5 (16): Mountain Rescue
-            - Bit 6 (32): Manually initiated eCall
-            - Bit 7 (64): Automatically initiated eCall
-            - Bit 8 (128): is spare and set to "0"
-        - Condition: there are following values:
-            - 0: ecc only when no sim
-            - 1: ecc always
-            - 2: MMI will show ecc but send to nw as normal call
-        - Plmn: Operator PLMN which contains MCC+MNC.
-                Use FFF or FF for all operators under same country
-                Ex: 460 FFF means all operators in China
-    -->
-
-    <EccEntry Ecc="110" Category="1" Condition="1" />
-    <EccEntry Ecc="118" Category="8" Condition="1" />
-    <EccEntry Ecc="119" Category="6" Condition="1" />
-</EccTable>
diff --git a/proprietary/vendor/etc/ecc_list_OP18.xml b/proprietary/vendor/etc/ecc_list_OP18.xml
deleted file mode 100644
index fb36e2d..0000000
--- a/proprietary/vendor/etc/ecc_list_OP18.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<EccTable>
-    <!--
-        Configure emergency numbers for Reliance(OP18) load. For the emergey numbers defined in
-        3GPP TS 22.101 (112/911 when SIM/USIM present and 112/911/000/08/110/118/119/999
-        when SIM/USIM not present) it will be configure in default emergency number source,
-        so no need to configure here if there is no special request for these numbers.
-
-        The attribute definition for tag EccEntry:
-        - Ecc: the emergnecy number
-        - Category: the service category (From 3GPP TS24.008)
-            - Bit 1 (1): Police
-            - Bit 2 (2): Ambulance
-            - Bit 3 (4): Fire Brigade
-            - Bit 4 (8): Marine Guard
-            - Bit 5 (16): Mountain Rescue
-            - Bit 6 (32): Manually initiated eCall
-            - Bit 7 (64): Automatically initiated eCall
-            - Bit 8 (128): is spare and set to "0"
-        - Condition: there are following values:
-            - 0: ecc only when no sim
-            - 1: ecc always
-            - 2: MMI will show ecc but send to nw as normal call
-        - Plmn: Operator PLMN which contains MCC+MNC.
-                Use FFF or FF for all operators under same country
-                Ex: 460 FFF means all operators in China
-    -->
-
-    <EccEntry Ecc="100" Category="0" Condition="2" />
-    <EccEntry Ecc="101" Category="0" Condition="2" />
-    <EccEntry Ecc="102" Category="0" Condition="2" />
-</EccTable>
diff --git a/proprietary/vendor/etc/ecc_list_OP236.xml b/proprietary/vendor/etc/ecc_list_OP236.xml
deleted file mode 100644
index d4f7cbb..0000000
--- a/proprietary/vendor/etc/ecc_list_OP236.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<EccTable>
-    <!--
-        Configure emergency numbers for USCC(OP236) load. For the emergey numbers defined in
-        3GPP TS 22.101 (112/911 when SIM/USIM present and 112/911/000/08/110/118/119/999
-        when SIM/USIM not present) it will be configure in default emergency number source,
-        so no need to configure here if there is no special request for these numbers.
-
-        The attribute definition for tag EccEntry:
-        - Ecc: the emergnecy number
-        - Category: the service category (From 3GPP TS24.008)
-            - Bit 1 (1): Police
-            - Bit 2 (2): Ambulance
-            - Bit 3 (4): Fire Brigade
-            - Bit 4 (8): Marine Guard
-            - Bit 5 (16): Mountain Rescue
-            - Bit 6 (32): Manually initiated eCall
-            - Bit 7 (64): Automatically initiated eCall
-            - Bit 8 (128): is spare and set to "0"
-        - Condition: there are following values:
-            - 0: ecc only when no sim
-            - 1: ecc always
-            - 2: MMI will show ecc but send to nw as normal call
-        - Plmn: Operator PLMN which contains MCC+MNC.
-                Use FFF or FF for all operators under same country
-                Ex: 460 FFF means all operators in China
-    -->
-
-    <EccEntry Ecc="*911" Category="0" Condition="1" />
-    <EccEntry Ecc="#911" Category="0" Condition="1" />
-    <EccEntry Ecc="*272911" Category="0" Condition="1" />
-</EccTable>
diff --git a/proprietary/vendor/etc/init/netdagent.rc b/proprietary/vendor/etc/init/netdagent.rc
deleted file mode 100644
index 26e19fe..0000000
--- a/proprietary/vendor/etc/init/netdagent.rc
+++ /dev/null
@@ -1,21 +0,0 @@
-service netdagent /vendor/bin/netdagent
-    class late_start
-    #socket netdagent stream 0660 root system
-    user system
-    group net_admin net_raw system misc
-    capabilities NET_ADMIN NET_RAW
-
-on property:persist.vendor.operator.optr=OP12
-    write /proc/sys/net/optr 12
-
-# NTT also need this feature. optr in kernel
-# only is like a feature option to enable this
-# feature. No longer operator code meaning again.
-on property:persist.vendor.operator.optr=OP17
-    write /proc/sys/net/optr 12
-
-# ATT also need this feature. optr in kernel
-# only is like a feature option to enable this
-# feature. No longer operator code meaning again.
-on property:persist.vendor.operator.optr=OP07
-    write /proc/sys/net/optr 12
diff --git a/proprietary/vendor/lib64/hw/audio.primary.mediatek.so b/proprietary/vendor/lib64/hw/audio.primary.mediatek.so
index d68c1e4..1a8d6de 100644
Binary files a/proprietary/vendor/lib64/hw/audio.primary.mediatek.so and b/proprietary/vendor/lib64/hw/audio.primary.mediatek.so differ
diff --git a/proprietary/vendor/lib64/hw/hwcomposer.mtk_common.so b/proprietary/vendor/lib64/hw/hwcomposer.mtk_common.so
index 7fb53e0..5f25f42 100644
Binary files a/proprietary/vendor/lib64/hw/hwcomposer.mtk_common.so and b/proprietary/vendor/lib64/hw/hwcomposer.mtk_common.so differ
diff --git a/proprietary/vendor/lib64/libforkexecwrap.so b/proprietary/vendor/lib64/libforkexecwrap.so
deleted file mode 100644
index 0b3125b..0000000
Binary files a/proprietary/vendor/lib64/libforkexecwrap.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libifcutils_mtk.so b/proprietary/vendor/lib64/libifcutils_mtk.so
deleted file mode 100644
index 84ad3f2..0000000
Binary files a/proprietary/vendor/lib64/libifcutils_mtk.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libwifi-hal-mtk.so b/proprietary/vendor/lib64/libwifi-hal-mtk.so
new file mode 100644
index 0000000..7c2c369
Binary files /dev/null and b/proprietary/vendor/lib64/libwifi-hal-mtk.so differ
diff --git a/rodin-vendor.mk b/rodin-vendor.mk
index 3b5cc04..065145b 100644
--- a/rodin-vendor.mk
+++ b/rodin-vendor.mk
@@ -479,13 +479,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/rodin/proprietary/vendor/etc/camera/mt6899/gma_custom.txt:$(TARGET_COPY_OUT_VENDOR)/etc/camera/mt6899/gma_custom.txt \
     vendor/xiaomi/rodin/proprietary/vendor/etc/dolby/dax-default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-default.xml \
     vendor/xiaomi/rodin/proprietary/vendor/etc/ecc_list.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list.xml \
-    vendor/xiaomi/rodin/proprietary/vendor/etc/ecc_list_OP01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP01.xml \
-    vendor/xiaomi/rodin/proprietary/vendor/etc/ecc_list_OP02.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP02.xml \
-    vendor/xiaomi/rodin/proprietary/vendor/etc/ecc_list_OP09.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP09.xml \
-    vendor/xiaomi/rodin/proprietary/vendor/etc/ecc_list_OP12.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP12.xml \
-    vendor/xiaomi/rodin/proprietary/vendor/etc/ecc_list_OP17.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP17.xml \
-    vendor/xiaomi/rodin/proprietary/vendor/etc/ecc_list_OP18.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP18.xml \
-    vendor/xiaomi/rodin/proprietary/vendor/etc/ecc_list_OP236.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP236.xml \
     vendor/xiaomi/rodin/proprietary/vendor/etc/ecc_list_preference.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_preference.xml \
     vendor/xiaomi/rodin/proprietary/vendor/etc/elliptic_sensor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/elliptic_sensor.xml \
     vendor/xiaomi/rodin/proprietary/vendor/etc/gnss/agps_profiles_conf2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/agps_profiles_conf2.xml \
@@ -540,7 +533,6 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/rodin/proprietary/vendor/etc/init/mtk_agpsd_p.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/mtk_agpsd_p.rc \
     vendor/xiaomi/rodin/proprietary/vendor/etc/init/mtkrild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/mtkrild.rc \
     vendor/xiaomi/rodin/proprietary/vendor/etc/init/muxreport.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/muxreport.rc \
-    vendor/xiaomi/rodin/proprietary/vendor/etc/init/netdagent.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/netdagent.rc \
     vendor/xiaomi/rodin/proprietary/vendor/etc/init/nvram_daemon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/nvram_daemon.rc \
     vendor/xiaomi/rodin/proprietary/vendor/etc/init/secure_element-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/secure_element-service.rc \
     vendor/xiaomi/rodin/proprietary/vendor/etc/init/tee-supplicant.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tee-supplicant.rc \
@@ -855,7 +847,6 @@ PRODUCT_PACKAGES += \
     libfeaturepolicy \
     libfgauge_gm30 \
     libfile_op \
-    libforkexecwrap \
     libformatter \
     libfsmsmartpaparse \
     libfvaudio \
@@ -874,7 +865,6 @@ PRODUCT_PACKAGES += \
     libhfmanagerwrapper \
     libhidparser \
     libhwm \
-    libifcutils_mtk \
     libimagebuffer_wrapper \
     libimgstream_sync \
     libimgsys_osal \
@@ -1046,6 +1036,7 @@ PRODUCT_PACKAGES += \
     libvow_comp_test \
     libvpu5 \
     libwapi \
+    libwifi-hal-mtk \
     libwifical \
     libwifinvram \
     libwifinvramdata \
@@ -1807,7 +1798,6 @@ PRODUCT_PACKAGES += \
     mnld \
     mtk_agpsd \
     muxreport \
-    netdagent \
     nvram_daemon \
     rcs_volte_stack \
     tee-supplicant \