diff --git a/public/blkid.te b/public/blkid.te
index 43bc944574168f23bce4d27280569ac2cc643cd8..c8df183f865bb8c1cbfb2ccad4f3652c99a0217a 100644
--- a/public/blkid.te
+++ b/public/blkid.te
@@ -1,5 +1,5 @@
 # blkid called from vold
-type blkid, domain, domain_deprecated;
+type blkid, domain;
 type blkid_exec, exec_type, file_type;
 
 # Allowed read-only access to encrypted devices to extract UUID/label
diff --git a/public/blkid_untrusted.te b/public/blkid_untrusted.te
index da3bdac7b0d09017c9345966ba0c6609a7cb6d88..cbbbbae5780cf5d74bf6231fd561d503830e8e0f 100644
--- a/public/blkid_untrusted.te
+++ b/public/blkid_untrusted.te
@@ -1,5 +1,5 @@
 # blkid for untrusted block devices
-type blkid_untrusted, domain, domain_deprecated;
+type blkid_untrusted, domain;
 
 # Allowed read-only access to vold block devices to extract UUID/label
 allow blkid_untrusted block_device:dir search;
diff --git a/public/dnsmasq.te b/public/dnsmasq.te
index c52640f1d765db9afc08211c0bcfb538fdd17fe4..ccac69a3370c0e65a91a4dcaf1b41fd2d187ad5c 100644
--- a/public/dnsmasq.te
+++ b/public/dnsmasq.te
@@ -1,5 +1,5 @@
 # DNS, DHCP services
-type dnsmasq, domain, domain_deprecated;
+type dnsmasq, domain;
 type dnsmasq_exec, exec_type, file_type;
 
 net_domain(dnsmasq)
diff --git a/public/idmap.te b/public/idmap.te
index c1b4d0fd8d5ad000f84eb991bcac08403688e2de..1ab497ee07d8755d93cc83a5aa38358d2de2d93c 100644
--- a/public/idmap.te
+++ b/public/idmap.te
@@ -1,5 +1,5 @@
 # idmap, when executed by installd
-type idmap, domain, domain_deprecated;
+type idmap, domain;
 type idmap_exec, exec_type, file_type;
 
 # Use open file to /data/resource-cache file inherited from installd.
diff --git a/public/nfc.te b/public/nfc.te
index f887c2894866e45fb50f5cd099aa7c241143de13..9296a727f1d58605b7589504a23eea30e202035d 100644
--- a/public/nfc.te
+++ b/public/nfc.te
@@ -1,5 +1,5 @@
 # nfc subsystem
-type nfc, domain, domain_deprecated;
+type nfc, domain;
 
 net_domain(nfc)
 binder_service(nfc)
diff --git a/public/sgdisk.te b/public/sgdisk.te
index 43636d4316f5ff017ba76949e61da86cb40e8ac2..3007398783ac3ed427f653098985d0a98788cca1 100644
--- a/public/sgdisk.te
+++ b/public/sgdisk.te
@@ -1,5 +1,5 @@
 # sgdisk called from vold
-type sgdisk, domain, domain_deprecated;
+type sgdisk, domain;
 type sgdisk_exec, exec_type, file_type;
 
 # Allowed to read/write low-level partition tables
diff --git a/public/surfaceflinger.te b/public/surfaceflinger.te
index 608afc5d62a4922d35920b403e6a3884bf1eb0c3..699984f144b0b2329e322d9d1b68e534e6bb530d 100644
--- a/public/surfaceflinger.te
+++ b/public/surfaceflinger.te
@@ -1,5 +1,5 @@
 # surfaceflinger - display compositor service
-type surfaceflinger, domain, domain_deprecated;
+type surfaceflinger, domain;
 type surfaceflinger_exec, exec_type, file_type;
 
 typeattribute surfaceflinger mlstrustedsubject;
diff --git a/public/tzdatacheck.te b/public/tzdatacheck.te
index 37daa7516b1fedfd2d1737bea3539497c37cf15c..93ae1652973296cd7eaa49da7f2c1755a3b8baec 100644
--- a/public/tzdatacheck.te
+++ b/public/tzdatacheck.te
@@ -1,5 +1,5 @@
 # The tzdatacheck command run by init.
-type tzdatacheck, domain, domain_deprecated;
+type tzdatacheck, domain;
 type tzdatacheck_exec, exec_type, file_type;
 
 allow tzdatacheck zoneinfo_data_file:dir create_dir_perms;
diff --git a/public/vdc.te b/public/vdc.te
index 394ac96aa65ec44c661f4038e2030fe95826cd36..67fb7a3a0e221bd928a7b775ef667aab89898da4 100644
--- a/public/vdc.te
+++ b/public/vdc.te
@@ -5,7 +5,7 @@
 # We also transition into this domain from dumpstate, when
 # collecting bug reports.
 
-type vdc, domain, domain_deprecated;
+type vdc, domain;
 type vdc_exec, exec_type, file_type;
 
 unix_socket_connect(vdc, vold, vold)