diff --git a/BoardConfig.mk b/BoardConfig.mk
index 5ad2332..813c8c2 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -17,8 +17,6 @@ TARGET_OTA_ASSERT_DEVICE := sweet,sweetin
 TARGET_PROVIDES_AUDIO_EXTNS := true
 
 # HIDL
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := $(DEVICE_PATH)/configs/hidl/device_framework_compatibility_matrix.xml
-DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += vendor/lineage/config/device_framework_matrix.xml
 DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/configs/hidl/manifest.xml
 ODM_MANIFEST_SKUS += sweet
 ODM_MANIFEST_SWEET_FILES := \
diff --git a/configs/hidl/device_framework_compatibility_matrix.xml b/configs/hidl/device_framework_compatibility_matrix.xml
deleted file mode 100644
index b2faf9f..0000000
--- a/configs/hidl/device_framework_compatibility_matrix.xml
+++ /dev/null
@@ -1,348 +0,0 @@
-<!-- Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<compatibility-matrix version="1.0" type="framework">
-<hal format="hidl">
-    <name>android.hardware.ir</name>
-    <version>1.0</version>
-    <interface>
-        <name>IConsumerIr</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>android.hardware.gnss</name>
-    <version>1.0</version>
-    <interface>
-        <name>IGnss</name>
-        <instance>gnss_vendor</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>android.hardware.radio</name>
-    <version>1.0-2</version>
-    <interface>
-        <name>ISap</name>
-        <instance>slot2</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>com.dsi.ant</name>
-    <version>1.0</version>
-    <interface>
-        <name>IAnt</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>com.qualcomm.qti.dpm.api</name>
-    <version>1.0</version>
-    <interface>
-        <name>IdpmQmi</name>
-        <instance>dpmQmiService</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>com.qualcomm.qti.imscmservice</name>
-    <version>2.0-2</version>
-    <interface>
-        <name>IImsCmService</name>
-        <instance>qti.ims.connectionmanagerservice</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>com.qualcomm.qti.uceservice</name>
-    <version>2.0-3</version>
-    <interface>
-        <name>IUceService</name>
-        <instance>com.qualcomm.qti.uceservice</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.display.config</name>
-    <version>2.0</version>
-    <interface>
-        <name>IDisplayConfig</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.goodix.hardware.biometrics.fingerprint</name>
-    <version>2.0-1</version>
-    <interface>
-        <name>IGoodixFingerprintDaemon</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.xiaomi.hardware.fingerprintextension</name>
-    <version>1.0</version>
-    <interface>
-        <name>IXiaomiFingerprint</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.data.factory</name>
-    <version>2.0-3</version>
-    <interface>
-        <name>IFactory</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.gnss</name>
-    <version>1.0-2</version>
-    <version>2.0-1</version>
-    <version>3.0</version>
-    <version>4.0</version>
-    <interface>
-        <name>ILocHidlGnss</name>
-        <instance>gnss_vendor</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.alarm</name>
-    <version>1.0</version>
-    <interface>
-        <name>IAlarm</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.bluetooth_audio</name>
-    <version>2.1</version>
-    <interface>
-        <name>IBluetoothAudioProvidersFactory</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.bluetooth_sar</name>
-    <version>1.0-1</version>
-    <interface>
-        <name>IBluetoothSar</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.btconfigstore</name>
-    <version>2.0</version>
-    <interface>
-        <name>IBTConfigStore</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.cacert</name>
-    <version>1.0</version>
-    <interface>
-        <name>IService</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.capabilityconfigstore</name>
-    <version>1.0</version>
-    <interface>
-        <name>ICapabilityConfigStore</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.data.connection</name>
-    <version>1.0-1</version>
-    <interface>
-        <name>IDataConnection</name>
-        <instance>slot1</instance>
-        <instance>slot2</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.data.latency</name>
-    <version>1.0</version>
-    <interface>
-        <name>ILinkLatency</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.display.allocator</name>
-    <version>3.0</version>
-    <version>4.0</version>
-    <interface>
-        <name>IQtiAllocator</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.display.mapper</name>
-    <version>3.0</version>
-    <version>4.0</version>
-    <interface>
-        <name>IQtiMapper</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.dsp</name>
-    <version>1.0</version>
-    <interface>
-        <name>IDspService</name>
-        <instance>dspservice</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.fm</name>
-    <version>1.0</version>
-    <interface>
-        <name>IFmHci</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.radio.am</name>
-    <version>1.0</version>
-    <interface>
-        <name>IQcRilAudio</name>
-        <instance>slot1</instance>
-        <instance>slot2</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.radio.ims</name>
-    <version>1.0-7</version>
-    <interface>
-        <name>IImsRadio</name>
-        <instance>imsradio0</instance>
-        <instance>imsradio1</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.radio.internal.deviceinfo</name>
-    <version>1.0</version>
-    <interface>
-        <name>IDeviceInfo</name>
-        <instance>deviceinfo</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.radio.lpa</name>
-    <version>1.0</version>
-    <interface>
-        <name>IUimLpa</name>
-        <instance>UimLpa0</instance>
-        <instance>UimLpa1</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.radio.qcrilhook</name>
-    <version>1.0</version>
-    <interface>
-        <name>IQtiOemHook</name>
-        <instance>oemhook0</instance>
-        <instance>oemhook1</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.radio.qtiradio</name>
-    <version>1.0</version>
-    <version>2.0-6</version>
-    <interface>
-        <name>IQtiRadio</name>
-        <instance>slot1</instance>
-        <instance>slot2</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.radio.uim</name>
-    <version>1.0-2</version>
-    <interface>
-        <name>IUim</name>
-        <instance>Uim0</instance>
-        <instance>Uim1</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.radio.uim_remote_client</name>
-    <version>1.0</version>
-    <interface>
-        <name>IUimRemoteServiceClient</name>
-        <instance>uimRemoteClient0</instance>
-        <instance>uimRemoteClient1</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.radio.uim_remote_server</name>
-    <version>1.0</version>
-    <interface>
-        <name>IUimRemoteServiceServer</name>
-        <instance>uimRemoteServer0</instance>
-        <instance>uimRemoteServer1</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.soter</name>
-    <version>1.0</version>
-    <interface>
-        <name>ISoter</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.hardware.vpp</name>
-    <version>1.0-3</version>
-    <interface>
-        <name>IHidlVppService</name>
-        <instance>vppService</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.ims.callinfo</name>
-    <version>1.0</version>
-    <interface>
-        <name>IService</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.ims.factory</name>
-    <version>1.0</version>
-    <interface>
-        <name>IImsFactory</name>
-        <instance>default</instance>
-    </interface>
-</hal>
-<hal format="hidl">
-    <name>vendor.qti.imsrtpservice</name>
-    <version>3.0</version>
-    <interface>
-        <name>IRTPService</name>
-        <instance>imsrtpservice</instance>
-    </interface>
-</hal>
-</compatibility-matrix>