diff --git a/non_plat/netdiag.te b/non_plat/netdiag.te
index f8d8b4c..cb19c48 100644
--- a/non_plat/netdiag.te
+++ b/non_plat/netdiag.te
@@ -26,6 +26,3 @@ allow netdiag mmc_prop:file { getattr open };
 # purpose: allow netdiag to access storage in new version
 allow netdiag media_rw_data_file:file  { create_file_perms };
 allow netdiag media_rw_data_file:dir { create_dir_perms };
-
-# Fix boot up SELinux violation
-allow netdiag mtk_em_ril_apnchange_prop:file open;
diff --git a/non_plat/property.te b/non_plat/property.te
index 3d7f831..446bb4d 100644
--- a/non_plat/property.te
+++ b/non_plat/property.te
@@ -121,21 +121,12 @@ type mtk_em_prop, property_type, mtk_core_property_type;
 #=============allow mediatek_prop ==============
 type mediatek_prop, property_type, mtk_core_property_type;
 
-#============= allow em set protocol ===============
-type mtk_em_pdn_prop, property_type, mtk_core_property_type;
-
-#============= allow em set protocol ===============
-type mtk_em_ims_simulate_prop, property_type, mtk_core_property_type;
-
 #============= allow em set property ===============
 type mtk_em_auto_answer_prop, property_type, mtk_core_property_type;
 
 #============= allow em set protocol ===============
 type mtk_em_bt_sspdebug_prop, property_type, mtk_core_property_type;
 
-#============= allow em set mtk_em_ril_apnchange_prop property ===============
-type mtk_em_ril_apnchange_prop, property_type;
-
 #============= allow em set protocol ===============
 type mtk_em_net_auto_tethering_prop, property_type, mtk_core_property_type;
 
diff --git a/non_plat/property_contexts b/non_plat/property_contexts
index a459e68..db04dd4 100644
--- a/non_plat/property_contexts
+++ b/non_plat/property_contexts
@@ -130,20 +130,11 @@ mediatek. u:object_r:mediatek_prop:s0
 debug.camera.p2plug.log u:object_r:mediatek_prop:s0
 
 #=============allow em set protocol================
-volte.emergency.pdn.protocol    u:object_r:mtk_em_pdn_prop:s0
-
-#=============allow em set protocol================
-persist.ims.simulate   u:object_r:mtk_em_ims_simulate_prop:s0
-
-#=============allow em set protocol================
-persist.auto_answer   u:object_r:mtk_em_auto_answer_prop:s0
+persist.vendor.auto_answer   u:object_r:mtk_em_auto_answer_prop:s0
 
 #=============allow em set protocol================
 persist.bt.sspdebug.enable   u:object_r:mtk_em_bt_sspdebug_prop:s0
 
-#=============allow em set ril.force_apn_change property================
-ril.force_apn_change u:object_r:mtk_em_ril_apnchange_prop:s0
-
 #=============allow em set protocol================
 persist.vendor.net.auto.tethering   u:object_r:mtk_em_net_auto_tethering_prop:s0
 
@@ -155,8 +146,6 @@ ril.iccid.sim u:object_r:mtk_telephony_sensitive_prop:s0
 persist.radio.last_iccid_sim  u:object_r:mtk_telephony_sensitive_prop:s0
 ro.mtk_md_mims_support u:object_r:mtk_telephony_sensitive_prop:s0
 
-
-
 #=============allow processes to change thermal config================
 thermal.manager.data u:object_r:mtk_thermal_config_prop:s0
 
@@ -168,7 +157,7 @@ debug.sf.hwc_pid u:object_r:graphics_hwc_pid_prop:s0
 persist.mtkcam. u:object_r:mtkcam_prop:s0
 mtkcam. u:object_r:mtkcam_prop:s0
 
-#=============allow radio  to set xcap config================
+#=============allow radio  to set em xcap config================
 persist.ss. u:object_r:mtk_em_ril_xcapset_prop:s0
 persist.gba. u:object_r:mtk_em_ril_xcapset_prop:s0
 
diff --git a/non_plat/radio.te b/non_plat/radio.te
index 5f357de..6078d94 100644
--- a/non_plat/radio.te
+++ b/non_plat/radio.te
@@ -63,15 +63,6 @@ allowxperm radio self:udp_socket ioctl { SIOCIWFIRSTPRIV-SIOCIWFIRSTPRIV_09 SIOC
 allow radio block_device:dir search;
 allow radio ttyGS_device:chr_file { open read write ioctl };
 
-#Date : 2015/10/27
-#Operation: patch back
-# Purpose: for set volte emergency pdn protocol
-allow radio mtk_em_pdn_prop:property_service set;
-
-#Date : 2015/11/11
-#Operation: IT
-# Purpose: for set ims simulate
-allow radio mtk_em_ims_simulate_prop:property_service set;
 
 #Date : 2015/11/13
 #Operation: IT
@@ -104,11 +95,6 @@ allow radio ccci_fsd:dir { r_dir_perms };
 allow radio nvdata_file:dir search;
 allow radio nvdata_file:file rw_file_perms;
 
-# Date : W1630 2016/07/21
-# Operation: IT
-# Purpose: for set ril.force_apn_change property in EM IA
-allow radio mtk_em_ril_apnchange_prop:property_service set;
-
 #Date : 2016/11/08
 #Operation: IT
 #Purpose: for set persist.net.auto.tethering