diff --git a/fingerprint/init.qfp.sh b/fingerprint/init.qfp.sh
deleted file mode 100644
index db3ffa58..00000000
--- a/fingerprint/init.qfp.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/vendor/bin/sh
-
-QTI_VFS_DIR=/data/vendor/misc/qti_fp
-VFS_CALIB_PATH=$QTI_VFS_DIR/vfs_calib.dat
-VFS_CALIB_SRC=/vendor/etc/qti_fp/vfs_calib.dat
-
-# Update prop if not already set.
-init_prop() {
-    PROP=`getprop $1`
-    if [[ -z "$PROP" ]]
-    then
-      setprop $1 "$2"
-    fi
-}
-
-# Clear prop
-clear_prop() {
-  setprop $1 ""
-}
-
-UPDATE_VFS=`getprop persist.vendor.qfp.update_vfs_calib`
-
-# Copy if file doesn't exist or if the persist flag is set.
-if [[ ! -f $VFS_CALIB_PATH || $UPDATE_VFS -eq 1 ]]; then
-    log -p v "QFP: Updating vfs_calib.dat"
-    mkdir -p $QTI_VFS_DIR
-    chmod 0777 $QTI_VFS_DIR
-    cp $VFS_CALIB_SRC $VFS_CALIB_PATH
-    chmod 0777 $VFS_CALIB_PATH
-    chown system:system $VFS_CALIB_PATH
-    # Clear the flag after the initial copy.
-    clear_prop persist.vendor.qfp.update_vfs_calib
-fi
-
-init_prop persist.vendor.qfp.enable_pv "12 0 0"
-init_prop persist.vendor.qfp.enable_setprop 0
-
-# If enable_setprop is 0 (disabled), delete the set props and use the hardcoded.
-if [[ `getprop persist.vendor.qfp.enable_setprop` -eq 0 ]]; then
-  clear_prop persist.vendor.qfp
-  clear_prop persist.vendor.qfp.enable_intr2
-  clear_prop persist.vendor.qfp.enable_fd
-  clear_prop persist.vendor.qfp.enable_td
-  clear_prop persist.vendor.qfp.enable_ntz
-  clear_prop persist.vendor.qfp.fd_events_src
-  clear_prop persist.vendor.qfp.tz_srv_name
-  clear_prop persist.vendor.qfp.tz_dev_name
-  clear_prop persist.vendor.qfp.vfs_info
-fi
-
-# Default to debug log level
-init_prop log.tag.QFP 3
diff --git a/fingerprint/ultrasonic_udfps.mk b/fingerprint/ultrasonic_udfps.mk
index 72fef668..242810e7 100644
--- a/fingerprint/ultrasonic_udfps.mk
+++ b/fingerprint/ultrasonic_udfps.mk
@@ -27,13 +27,12 @@ PRODUCT_COPY_FILES += \
 
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/caimito/fingerprint/device_framework_matrix_product.xml
 
-PRODUCT_COPY_FILES += \
-	device/google/caimito/fingerprint/init.qfp.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qfp.sh
-
 #$(call soong_config_set,fp_hal_feature,biometric_suez_support,true)
 
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.qfp.update_vfs_calib=1
+	persist.vendor.qfp.enable_setprop=0 \
+	log.tag.QFP=3
 
 ifneq (,$(findstring factory, $(TARGET_PRODUCT)))
 PRODUCT_PACKAGES += QfsFactoryTest