diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor_device.xml b/overlay/packages/apps/CarrierConfig/res/xml/vendor_device.xml
deleted file mode 100644
index 87fb142b..00000000
--- a/overlay/packages/apps/CarrierConfig/res/xml/vendor_device.xml
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<carrier_config_list>
-    <carrier_config mcc="460" mnc="03,05,11,12">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="460" mnc="01,06,09">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="454" mnc="00,02,16,18,19">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="454" mnc="12,13">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="454" mnc="06,15,17">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="454" mnc="03">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="466" mnc="01">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="466" mnc="05">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="466" mnc="89">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="466" mnc="92">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="466" mnc="97">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="525" mnc="05" gid1="0A">
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="510" mnc="09,28">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="250" mnc="02">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="520" mnc="03">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="520" mnc="05">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="525" mnc="01">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="525" mnc="03">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="334" mnc="020">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="450" mnc="05">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="450" mnc="06">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="450" mnc="08">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="716" mnc="17">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="242" mnc="14">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="286" mnc="02">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="413" mnc="01,02">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="202" mnc="01">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="730" mnc="01">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="730" mnc="09">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="248" mnc="02">
-        <boolean name="carrier_volte_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config>
-        <boolean name="carrier_volte_available_bool" value="false" />
-        <boolean name="carrier_vt_available_bool" value="false" />
-        <boolean name="config_enable_vt_with_mobile_data_off" value="true" />
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="false" />
-        <int name="carrier_default_wfc_ims_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config sdk="26">
-        <boolean name="vilte_data_is_metered_bool" value="false" />
-    </carrier_config>
-    <carrier_config mcc="208" mnc="10" sdk="28">
-        <boolean name="gsm_cdma_calls_can_be_hd_audio" value="true" />
-    </carrier_config>
-    <carrier_config mcc="268" mnc="06">
-        <string name="default_vm_number_string">+351962000000</string>
-    </carrier_config>
-    <carrier_config mcc="334" mnc="020">
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="460">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="460" mnc="01,06,09">
-        <boolean name="carrier_volte_available_bool" value="false" />
-        <boolean name="carrier_vt_available_bool" value="false" />
-    </carrier_config>
-    <carrier_config mcc="460" mnc="01,06,09" sdk="28">
-        <boolean name="gsm_cdma_calls_can_be_hd_audio" value="true" />
-    </carrier_config>
-    <carrier_config mcc="460" mnc="03,05,11,12">
-        <boolean name="carrier_volte_available_bool" value="false" />
-        <boolean name="carrier_vt_available_bool" value="false" />
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type" />
-            <item value="" />
-        </string-array>
-    </carrier_config>
-    <carrier_config mcc="502" mnc="152">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="404">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="405">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="455" mnc="02,07">
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type" />
-            <item value="" />
-        </string-array>
-    </carrier_config>
-    <carrier_config mcc="525" mnc="05" sdk="28">
-        <boolean name="gsm_cdma_calls_can_be_hd_audio" value="true" />
-    </carrier_config>
-    <carrier_config mcc="530" mnc="24">
-        <string name="default_vm_number_string">+64222022002</string>
-    </carrier_config>
-    <carrier_config mcc="234" mnc="20">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="234" mnc="15">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-        <string-array name="read_only_apn_types_string_array" num="0" />
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="214" mnc="01">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="262" mnc="02,09">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-        <string name="default_vm_number_string">5500</string>
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="222" mnc="10">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="268" mnc="01">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="202" mnc="05">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-        <string name="default_vm_number_string">121</string>
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="208" mnc="10">
-        <string name="default_vm_number_string">123</string>
-        <string-array name="read_only_apn_types_string_array" num="0" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-    </carrier_config>
-    <carrier_config mcc="208" mnc="20">
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="222" mnc="10">
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="214" mnc="01">
-        <string name="default_vm_number_string">22177</string>
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="214" mnc="03,04,05,06,07,08,16,17,21,32">
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="730" mnc="09">
-        <string-array name="non_roaming_operator_string_array" num="4">
-            <item value="73001" />
-            <item value="73002" />
-            <item value="73003" />
-            <item value="73021" />
-        </string-array>
-    </carrier_config>
-    <carrier_config mcc="222" mnc="50">
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="208" mnc="15">
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="647" mnc="03">
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="647" mnc="10">
-        <string-array name="read_only_apn_types_string_array" num="0" />
-    </carrier_config>
-    <carrier_config mcc="272" mnc="02">
-        <string-array name="non_roaming_operator_string_array" num="1">
-            <item value="27205" />
-        </string-array>
-    </carrier_config>
-    <carrier_config mcc="272" mnc="05">
-        <string-array name="non_roaming_operator_string_array" num="1">
-            <item value="27202" />
-        </string-array>
-    </carrier_config>
-    <carrier_config mcc="466" mnc="01">
-        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="466" mnc="05">
-        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-    </carrier_config>
-    <carrier_config mcc="466" mnc="05">
-        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-        <int name="wfc_spn_format_idx_int" value="1" />
-        <string-array name="non_roaming_operator_string_array" num="1">
-            <item value="46697" />
-        </string-array>
-        <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="525" mnc="05" gid1="0A">
-        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-    </carrier_config>
-    <carrier_config mcc="456" mnc="11">
-        <boolean name="editable_enhanced_4g_lte_bool" value="false" />
-    </carrier_config>
-    <carrier_config mcc="226" mnc="01">
-        <boolean name="config_support_callbarring_over_ims" value="false" />
-    </carrier_config>
-    <carrier_config mcc="214" mnc="01">
-        <boolean name="config_support_callbarring_over_ims" value="false" />
-    </carrier_config>
-    <carrier_config mcc="510" mnc="28">
-        <boolean name="support_video_conference_call_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="286" mnc="02">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="202" mnc="10">
-        <boolean name="config_callbarring_base_on_volte" value="true" />
-    </carrier_config>
-    <carrier_config mcc="525" mnc="01">
-        <boolean name="config_callbarring_base_on_volte" value="true" />
-    </carrier_config>
-    <carrier_config mcc="730" mnc="09">
-        <string-array name="non_roaming_operator_string_array" num="4">
-            <item value="73001" />
-            <item value="73002" />
-            <item value="73003" />
-            <item value="73021" />
-        </string-array>
-    </carrier_config>
-    <carrier_config mcc="202" mnc="01">
-        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="732" mnc="101">
-        <string name="default_vm_number_string">*123</string>
-    </carrier_config>
-    <carrier_config mcc="716" mnc="10">
-        <string name="default_vm_number_string">131</string>
-    </carrier_config>
-    <carrier_config mcc="730" mnc="03">
-        <string name="default_vm_number_string">*20</string>
-    </carrier_config>
-    <carrier_config mcc="250" mnc="01">
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-    </carrier_config>
-</carrier_config_list>