diff --git a/non_plat/file_contexts b/non_plat/file_contexts
index ee6bba9..d160466 100644
--- a/non_plat/file_contexts
+++ b/non_plat/file_contexts
@@ -24,7 +24,7 @@
 /data/vendor/agps_supl(/.*)?    u:object_r:agpsd_data_file:s0
 #/data/mnl_flp(/.*)?    u:object_r:mnld_data_file:s0
 #/data/mnl_gfc(/.*)?    u:object_r:mnld_data_file:s0
-#/data/misc/gps(/.*)?   u:object_r:gps_data_file:s0
+/data/vendor/gps(/.*)?   u:object_r:gps_data_file:s0
 /data/anr/SF_RTT(/.*)? u:object_r:sf_rtt_file:s0
 #/data/ccci_cfg(/.*)? u:object_r:ccci_cfg_file:s0
 #/data/flashless(/.*)? u:object_r:c2k_file:s0
diff --git a/non_plat/mnld.te b/non_plat/mnld.te
index 539e70f..cb194c9 100644
--- a/non_plat/mnld.te
+++ b/non_plat/mnld.te
@@ -50,8 +50,6 @@ allow mnld merged_hal_service:unix_dgram_socket sendto;
 
 # Purpose : For access system data
 typeattribute mnld data_between_core_and_vendor_violators;
-allow mnld system_data_file:dir { write add_name };
-allow mnld system_data_file:lnk_file read;
 allow mnld bootdevice_block_device:blk_file rw_file_perms;
 allow mnld block_device:dir search;
 allow mnld mnld_prop:property_service set;
diff --git a/non_plat/system_server.te b/non_plat/system_server.te
index d8f95a9..10d8635 100644
--- a/non_plat/system_server.te
+++ b/non_plat/system_server.te
@@ -9,10 +9,6 @@ allow system_server irtx_device:chr_file rw_file_perms;
 allow system_server qemu_pipe_device:chr_file rw_file_perms;
 allow system_server wmtWifi_device:chr_file w_file_perms;
 
-# Access mtk gps devices.
-#allow system_server gps_data_file:file create_file_perms;
-#allow system_server gps_data_file:dir rw_dir_perms;
-
 # /proc access.
 #allow system_server proc:file w_file_perms;
 
@@ -43,20 +39,6 @@ allow system_server zygote:unix_stream_socket { getopt getattr };
 
 # Communicate over a socket created by mnld process.
 
-# TODO:: MTK need to remove later
-not_full_treble(`
-	allow system_server mnld_data_file:sock_file create_file_perms;
-	allow system_server mnld_data_file:sock_file rw_file_perms;
-')
-
-allow system_server mnld_data_file:dir create_file_perms;
-allow system_server mnld_data_file:dir rw_dir_perms;
-
-# TODO:: MTK need to remove later
-not_full_treble(`
-	allow system_server mnld:unix_dgram_socket sendto;
-')
-
 # Allow system_server to read /sys/kernel/debug/wakeup_sources
 allow system_server debugfs_wakeup_sources:file r_file_perms;