diff --git a/universal7885-common/configs/vintf/compatibility_matrix.3.xml b/universal7885-common/configs/vintf/compatibility_matrix.3.xml
deleted file mode 100644
index e075be1..0000000
--- a/universal7885-common/configs/vintf/compatibility_matrix.3.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<compatibility-matrix version="1.0" type="framework" level="3">
-   <hal format="hidl" optional="false">
-      <name>android.hardware.audio</name>
-      <version>4.0</version>
-      <interface>
-         <name>IDevicesFactory</name>
-         <instance>default</instance>
-      </interface>
-   </hal>
-   <hal format="hidl" optional="false">
-      <name>android.hardware.audio.effect</name>
-      <version>4.0</version>
-      <interface>
-         <name>IEffectsFactory</name>
-         <instance>default</instance>
-      </interface>
-   </hal>
-   <hal format="hidl" optional="true">
-      <name>android.hardware.bluetooth.a2dp</name>
-      <version>1.0</version>
-      <interface>
-         <name>IBluetoothAudioOffload</name>
-         <instance>default</instance>
-      </interface>
-   </hal>
-   <hal format="hidl" optional="true">
-      <name>android.hardware.cas</name>
-      <version>1.0</version>
-      <interface>
-         <name>IMediaCasService</name>
-         <instance>default</instance>
-      </interface>
-   </hal>
-   <hal format="hidl" optional="true">
-      <name>android.hardware.configstore</name>
-      <version>1.0-1</version>
-      <interface>
-         <name>ISurfaceFlingerConfigs</name>
-         <instance>default</instance>
-      </interface>
-   </hal>
-   <hal format="hidl" optional="true">
-      <name>android.hardware.gnss</name>
-      <version>1.0-1</version>
-      <interface>
-         <name>IGnss</name>
-         <instance>default</instance>
-      </interface>
-   </hal>
-   <hal format="hidl" optional="false">
-      <name>android.hardware.graphics.mapper</name>
-      <version>2.0-1</version>
-      <interface>
-         <name>IMapper</name>
-         <instance>default</instance>
-      </interface>
-   </hal>
-   <hal format="hidl" optional="true">
-      <name>android.hardware.nfc</name>
-      <version>1.1</version>
-      <interface>
-         <name>INfc</name>
-         <instance>default</instance>
-      </interface>
-   </hal>
-   <hal format="hidl" optional="true">
-      <name>android.hardware.radio</name>
-      <!-- ref: b/123249760. 1.3 added here since 1.3 and 1.4 introduced in Q -->
-      <version>1.0-3</version>
-      <interface>
-         <name>IRadio</name>
-         <instance>slot1</instance>
-         <instance>slot2</instance>
-         <instance>slot3</instance>
-      </interface>
-   </hal>
-   <hal format="hidl" optional="true">
-      <name>android.hardware.radio.config</name>
-      <version>1.0</version>
-      <interface>
-         <name>IRadioConfig</name>
-         <instance>default</instance>
-      </interface>
-   </hal>
-   <hal format="hidl" optional="true">
-      <name>android.hardware.thermal</name>
-      <version>1.0-1</version>
-      <interface>
-         <name>IThermal</name>
-         <instance>default</instance>
-      </interface>
-   </hal>
-   <hal format="hidl" optional="true">
-      <name>android.hardware.wifi.offload</name>
-      <version>1.0</version>
-      <interface>
-         <name>IOffload</name>
-         <instance>default</instance>
-      </interface>
-   </hal>
-   <kernel version="4.4.302" level="3">
-    </kernel>
-</compatibility-matrix>
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 9ed0762..6bbfbe9 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -375,10 +375,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.vibrator-service.samsung
 
-# Workaround for vintf issues...
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/vintf/compatibility_matrix.3.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/vintf/compatibility_matrix.3.xml
-
 # Wifi
 PRODUCT_PACKAGES += \
     android.hardware.wifi-service \