diff --git a/Aerodactyl-vendor.mk b/Aerodactyl-vendor.mk
index b4dca8a..a0de01d 100644
--- a/Aerodactyl-vendor.mk
+++ b/Aerodactyl-vendor.mk
@@ -186,14 +186,6 @@ PRODUCT_COPY_FILES += \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/dirac/interface.json:$(TARGET_COPY_OUT_VENDOR)/etc/dirac/interface.json \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/displayconfig/display_id_4627039422300187648.xml:$(TARGET_COPY_OUT_VENDOR)/etc/displayconfig/display_id_4627039422300187648.xml \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/ecc_list.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list.xml \
-    vendor/nothing/Aerodactyl/proprietary/vendor/etc/ecc_list_OP01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP01.xml \
-    vendor/nothing/Aerodactyl/proprietary/vendor/etc/ecc_list_OP02.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP02.xml \
-    vendor/nothing/Aerodactyl/proprietary/vendor/etc/ecc_list_OP09.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP09.xml \
-    vendor/nothing/Aerodactyl/proprietary/vendor/etc/ecc_list_OP12.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP12.xml \
-    vendor/nothing/Aerodactyl/proprietary/vendor/etc/ecc_list_OP17.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP17.xml \
-    vendor/nothing/Aerodactyl/proprietary/vendor/etc/ecc_list_OP18.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP18.xml \
-    vendor/nothing/Aerodactyl/proprietary/vendor/etc/ecc_list_OP20.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP20.xml \
-    vendor/nothing/Aerodactyl/proprietary/vendor/etc/ecc_list_OP236.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP236.xml \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/ecc_list_preference.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_preference.xml \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/felica/common.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/felica/common.cfg \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/felica/mfm.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/felica/mfm.cfg \
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_OP20.xml b/proprietary/vendor/etc/ecc_list_OP20.xml
deleted file mode 100644
index f3145f8..0000000
--- a/proprietary/vendor/etc/ecc_list_OP20.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<EccTable>
-    <!--
-        Configure emergency numbers for Sprint(OP20) 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" />
-</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>