diff --git a/system_server.te b/system_server.te
index 93849e4105b986422d3df7c37c95f0ae0a896d9d..8ab675505fc40ae8c0f1b72b74bc67f7a2051b81 100644
--- a/system_server.te
+++ b/system_server.te
@@ -277,11 +277,6 @@ allow system_server system_data_file:file relabelfrom;
 allow system_server wallpaper_file:file relabelto;
 allow system_server wallpaper_file:file { rw_file_perms unlink };
 
-# This was originally required for relabeling /data/anr,
-# but should not be used anymore. TODO: remove it.
-allow system_server system_data_file:dir relabelfrom;
-auditallow system_server system_data_file:dir relabelfrom;
-
 # Property Service write
 set_prop(system_server, system_prop)
 set_prop(system_server, dhcp_prop)
@@ -317,10 +312,6 @@ allow system_server cache_file:fifo_file create_file_perms;
 # Run system programs, e.g. dexopt.
 allow system_server system_file:file x_file_perms;
 
-# XXX Run toolbox.  Might not be needed.
-allow system_server toolbox_exec:file rx_file_perms;
-auditallow system_server toolbox_exec:file rx_file_perms;
-
 # LocationManager(e.g, GPS) needs to read and write
 # to uart driver and ctrl proc entry
 allow system_server gps_device:chr_file rw_file_perms;