diff --git a/framework_compatibility_matrix.xml b/framework_compatibility_matrix.xml
index d184fda..2322005 100644
--- a/framework_compatibility_matrix.xml
+++ b/framework_compatibility_matrix.xml
@@ -27,54 +27,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl" optional="true">
-        <name>com.motorola.hardware.display.panel</name>
-        <version>1.0</version>
-        <interface>
-            <name>IDisplayPanel</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>motorola.hardware.camera.imgtuner</name>
-        <version>1.0</version>
-        <interface>
-            <name>IImageTuning</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>motorola.hardware.fdrcontrol</name>
-        <version>1.0-2</version>
-        <interface>
-            <name>IFdrControl</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>motorola.hardware.health</name>
-        <version>2.0</version>
-        <interface>
-            <name>IMotHealth</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>motorola.hardware.vibrator</name>
-        <version>1.0</version>
-        <interface>
-            <name>IMotVibrator</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl" optional="true">
-        <name>motorola.hardware.wifi.supplicant</name>
-        <version>1.0-1</version>
-        <interface>
-            <name>ISupplicantMot</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.egistec.hardware.fingerprint</name>
         <version>2.0</version>
diff --git a/manifest.xml b/manifest.xml
index 32327a5..fcc9f47 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -225,20 +225,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <fqname>@1.0::IMotoFingerPrint/default</fqname>
         <fqname>@1.0::IMotoFingerPrintSensorTest/default</fqname>
     </hal>
-    <hal format="hidl">
-        <name>com.motorola.hardware.display.panel</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IDisplayPanel</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::IDisplayPanel/default</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>com.motorola.hardware.display.touch</name>
-        <transport>hwbinder</transport>
-    </hal>
     <hal format="hidl">
         <name>com.qualcomm.qti.dpm.api</name>
         <transport>hwbinder</transport>
@@ -269,60 +255,6 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         </interface>
         <fqname>@2.3::IUceService/com.qualcomm.qti.uceservice</fqname>
     </hal>
-    <hal format="hidl">
-        <name>motorola.hardware.camera.imgtuner</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IImageTuning</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::IImageTuning/default</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>motorola.hardware.fdrcontrol</name>
-        <transport>hwbinder</transport>
-        <version>1.2</version>
-        <interface>
-            <name>IFdrControl</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.2::IFdrControl/default</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>motorola.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>IMotHealth</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@2.0::IMotHealth/default</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>motorola.hardware.vibrator</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IMotVibrator</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.0::IMotVibrator/default</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>motorola.hardware.wifi.supplicant</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>ISupplicantMot</name>
-            <instance>default</instance>
-        </interface>
-        <fqname>@1.1::ISupplicantMot/default</fqname>
-    </hal>
-    <hal format="hidl" override="true">
-        <name>motorola.hardware.wireless.powershare</name>
-        <transport>hwbinder</transport>
-    </hal>
     <hal format="hidl">
         <name>vendor.qti.data.factory</name>
         <transport>hwbinder</transport>