diff --git a/app.te b/app.te
index 3e58736b9d10d4d2c0f3b2746460bc2d69b199b0..a6f584d223296566b4745bd50e4e91247b852bde 100644
--- a/app.te
+++ b/app.te
@@ -36,14 +36,12 @@ allow appdomain devpts:chr_file { getattr read write ioctl };
 # Communicate with system_server.
 allow appdomain system_server:fifo_file rw_file_perms;
 allow appdomain system_server:unix_stream_socket { read write setopt };
-binder_call(appdomain, system_server)
 
 # Communication with other apps via fifos
 allow appdomain appdomain:fifo_file rw_file_perms;
 
 # Communicate with surfaceflinger.
 allow appdomain surfaceflinger:unix_stream_socket { read write setopt };
-binder_call(appdomain, surfaceflinger)
 
 # App sandbox file accesses.
 allow appdomain app_data_file:dir create_dir_perms;
@@ -110,12 +108,6 @@ allow appdomain system_data_file:lnk_file getattr;
 allow appdomain download_file:dir search;
 allow appdomain download_file:file r_file_perms;
 
-# Allow applications to communicate with drmserver over binder
-binder_call(appdomain, drmserver)
-
-# Allow applications to communicate with mediaserver over binder
-binder_call(appdomain, mediaserver)
-
 # Allow apps to use the USB Accessory interface.
 # http://developer.android.com/guide/topics/connectivity/usb/accessory.html
 #
diff --git a/racoon.te b/racoon.te
index 1fbdb07fa240b3d0bb7d4056b21ab3a9d37e610e..02b4ba34285a45992e2c6fc5c9306dd109d6e9a6 100644
--- a/racoon.te
+++ b/racoon.te
@@ -8,7 +8,7 @@ typeattribute racoon mlstrustedsubject;
 
 net_domain(racoon)
 
-binder_call(racoon, servicemanager)
+binder_use(racoon)
 binder_call(racoon, keystore)
 
 allow racoon tun_device:chr_file r_file_perms;
diff --git a/system_app.te b/system_app.te
index a20a4ece1d3a8bd8e2ae454b7400d38e85c0b272..dc02118833918b4e3778a78841adea6a36e3d44a 100644
--- a/system_app.te
+++ b/system_app.te
@@ -9,9 +9,6 @@ app_domain(system_app)
 net_domain(system_app)
 binder_service(system_app)
 
-# Perform binder IPC to any app domain.
-binder_call(system_app, appdomain)
-
 # Read and write system data files.
 # May want to split into separate types.
 allow system_app system_data_file:dir create_dir_perms;
diff --git a/system_server.te b/system_server.te
index d7fd53039d4ac8654eae5404d855a9cd0413f147..cf4b158436a0b200b2aa695e47a144123ccad1e3 100644
--- a/system_server.te
+++ b/system_server.te
@@ -100,7 +100,6 @@ allow system_server surfaceflinger:unix_stream_socket { read write setopt };
 binder_use(system_server)
 binder_call(system_server, binderservicedomain)
 binder_call(system_server, appdomain)
-binder_call(system_server, healthd)
 binder_call(system_server, dumpstate)
 binder_service(system_server)