diff --git a/whitechapel_pro/service.te b/whitechapel_pro/service.te
index a4ba9973..8d5dc1ee 100644
--- a/whitechapel_pro/service.te
+++ b/whitechapel_pro/service.te
@@ -1,3 +1,2 @@
 type hal_pixel_display_service, service_manager_type, vendor_service;
 type hal_uwb_vendor_service, service_manager_type, vendor_service;
-type uwb_vendor_service, service_manager_type, vendor_service;
diff --git a/whitechapel_pro/service_contexts b/whitechapel_pro/service_contexts
index 94f813d8..5df34411 100644
--- a/whitechapel_pro/service_contexts
+++ b/whitechapel_pro/service_contexts
@@ -1,3 +1,2 @@
 com.google.hardware.pixel.display.IDisplay/default         u:object_r:hal_pixel_display_service:s0
 hardware.qorvo.uwb.IUwbVendor/default                      u:object_r:hal_uwb_vendor_service:s0
-uwb_vendor                                                 u:object_r:uwb_vendor_service:s0
diff --git a/whitechapel_pro/system_server.te b/whitechapel_pro/system_server.te
index 6e797f55..0e0a159b 100644
--- a/whitechapel_pro/system_server.te
+++ b/whitechapel_pro/system_server.te
@@ -1,7 +1 @@
 binder_call(system_server, hal_camera_default);
-
-# Allow system server to find vendor uwb service. In the legacy
-# UWB stack, system_server talks directly to the vendor stack.
-# TODO(b/186585880): This will be obsoleted when the new UCI stack for
-# UWB lands.
-allow system_server uwb_vendor_service:service_manager find;
diff --git a/whitechapel_pro/uwb_vendor_app.te b/whitechapel_pro/uwb_vendor_app.te
index 66237edc..364bee36 100644
--- a/whitechapel_pro/uwb_vendor_app.te
+++ b/whitechapel_pro/uwb_vendor_app.te
@@ -2,8 +2,6 @@ type uwb_vendor_app, domain;
 
 app_domain(uwb_vendor_app)
 
-add_service(uwb_vendor_app, uwb_vendor_service)
-
 not_recovery(`
 hal_client_domain(uwb_vendor_app, hal_uwb_vendor)