diff --git a/bluetooth/manifest_bluetooth.xml b/bluetooth/manifest_bluetooth.xml
index 2d055f4..2033d87 100644
--- a/bluetooth/manifest_bluetooth.xml
+++ b/bluetooth/manifest_bluetooth.xml
@@ -26,13 +26,4 @@
default
-
- hardware.google.bluetooth.ccc
- hwbinder
- 1.1
-
- IBluetoothCcc
- default
-
-
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index d283a87..50f3e7c 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -50,7 +50,6 @@ DISABLE_TELEPHONY_EUICC := true
include device/google/tangorpro/audio/tangorpro/audio-tables.mk
include device/google/gs201/device-shipping-common.mk
-DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/tangorpro/device_framework_matrix_product.xml
# go/lyric-soong-variables
$(call soong_config_set,lyric,camera_hardware,tangorpro)
$(call soong_config_set,lyric,tuning_product,tangorpro)
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
deleted file mode 100644
index c0f208c..0000000
--- a/device_framework_matrix_product.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- hardware.google.bluetooth.ccc
- 1.1
-
- IBluetoothCcc
- default
-
-
-
-
diff --git a/device_framework_matrix_product_tangorpro.xml b/device_framework_matrix_product_tangorpro.xml
index 3974e7e..8d3af1c 100644
--- a/device_framework_matrix_product_tangorpro.xml
+++ b/device_framework_matrix_product_tangorpro.xml
@@ -1,12 +1,4 @@
-
- hardware.google.bluetooth.ccc
- 1.1
-
- IBluetoothCcc
- default
-
-
device.google.atv.audio_proxy
diff --git a/manifest.xml b/manifest.xml
index 1f0aebe..31dc019 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -149,15 +149,6 @@
default
-
- hardware.google.bluetooth.ccc
- hwbinder
- 1.0
-
- IBluetoothCcc
- default
-
-
vendor.google.whitechapel.audio.audioext
hwbinder