diff --git a/fingerprint/device_framework_matrix_product.xml b/fingerprint/device_framework_matrix_product.xml
index 16b05592..8e0a33c5 100644
--- a/fingerprint/device_framework_matrix_product.xml
+++ b/fingerprint/device_framework_matrix_product.xml
@@ -6,27 +6,11 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="aidl" optional="true">
+    <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.fingerprint</name>
-        <version>1</version>
+        <version>1.0</version>
         <interface>
-            <name>IQfpExtendedFingerprint</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="aidl" optional="true">
-        <name>vendor.qti.hardware.fingerprint</name>
-        <version>1</version>
-        <interface>
-            <name>IQfpExtendedSession</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="aidl" optional="true">
-        <name>vendor.qti.hardware.fingerprint</name>
-        <version>1</version>
-        <interface>
-            <name>IQfpExtendedSessionCallback</name>
+            <name>IQtiExtendedFingerprint</name>
             <instance>default</instance>
         </interface>
     </hal>
diff --git a/fingerprint/ultrasonic_udfps.mk b/fingerprint/ultrasonic_udfps.mk
index df84688a..589560cd 100644
--- a/fingerprint/ultrasonic_udfps.mk
+++ b/fingerprint/ultrasonic_udfps.mk
@@ -16,12 +16,10 @@
 
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/qcom/fingerprint/qfp-service \
-	vendor/qcom/fingerprint/QFingerprintService \
 	vendor/qcom/fingerprint/QFPCalibration \
 
 PRODUCT_PACKAGES += \
 	qfp-daemon \
-	QFingerprintService \
 	QFPCalibration \
 
 PRODUCT_COPY_FILES += \