diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml
index 59db0ac..add0925 100644
--- a/audio/audio_effects.xml
+++ b/audio/audio_effects.xml
@@ -41,7 +41,6 @@
         <library name="volume_listener" path="libvolumelistener.so"/>
         <library name="audiosphere" path="libasphere.so"/>
         <library name="shoebox" path="libshoebox.so"/>
-        <library name="ozo_processing" path="libozoprocessing.so"/>
     </libraries>
     <effects>
         <effectProxy name="bassboost" library="proxy" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b">
@@ -90,7 +89,6 @@
         <effect name="notification_helper" library="volume_listener" uuid="0b776dde-0590-11e5-81ba-0025b32654a0"/>
         <effect name="audiosphere" library="audiosphere" uuid="184e62ab-2d19-4364-9d1b-c0a40733866c"/>
         <effect name="shoebox" library="shoebox" uuid="1eab784c-1a36-4b2a-b7fc-e34c44cab89e"/>
-        <effect name="ozo" library="ozo_processing" uuid="7e384a3b-7850-4a64-a097-884250d8a737"/>
     </effects>
     <postprocess>
         <stream type="music">
diff --git a/device.mk b/device.mk
index 5b7f04b..ad1d92a 100644
--- a/device.mk
+++ b/device.mk
@@ -76,11 +76,6 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml \
     frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \
-    frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml \
-    frameworks/native/data/etc/android.hardware.camera.front.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.front.xml \
-    frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \
-    frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml \
-    frameworks/native/data/etc/android.hardware.consumerir.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.consumerir.xml \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
     frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
     frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \
@@ -188,14 +183,14 @@ PRODUCT_PACKAGES += \
     vendor.qti.hardware.btconfigstore@2.0.vendor
 
 # Camera
-PRODUCT_PACKAGES += \
-    android.hardware.camera.provider@2.4-impl \
-    android.hardware.camera.provider@2.4-service_64 \
-    libcamera2ndk_vendor \
-    libdng_sdk.vendor \
-    libgui_vendor \
-    vendor.qti.hardware.camera.device@1.0.vendor \
-    vendor.qti.hardware.camera.postproc@1.0.vendor
+# PRODUCT_PACKAGES += \
+#     android.hardware.camera.provider@2.4-impl \
+#     android.hardware.camera.provider@2.4-service_64 \
+#     libcamera2ndk_vendor \
+#     libdng_sdk.vendor \
+#     libgui_vendor \
+#     vendor.qti.hardware.camera.device@1.0.vendor \
+#     vendor.qti.hardware.camera.postproc@1.0.vendor
 
 # Component overrides
 PRODUCT_COPY_FILES += \
@@ -231,6 +226,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     fastbootd
 
+# Fingerprint
+# PRODUCT_PACKAGES += \
+#     android.hardware.biometrics.fingerprint@2.1-service \
+#     android.hardware.biometrics.fingerprint@2.1.vendor
+
 # Gatekeeper
 PRODUCT_PACKAGES += \
     android.hardware.gatekeeper@1.0.vendor
@@ -502,4 +502,4 @@ PRODUCT_COPY_FILES += \
 
 # Vendor boot modules
 PRODUCT_COPY_FILES += \
-    $(call find-copy-subdir-files,*,$(KERNEL_PREBUILT)/modules/,$(TARGET_COPY_OUT_VENDOR_)/lib/modules)
+    $(call find-copy-subdir-files,*,$(KERNEL_PREBUILT)/modules/,$(TARGET_COPY_OUT_VENDOR)/lib/modules)
diff --git a/extract-files.sh b/extract-files.sh
index 86a68b7..ef28385 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -56,9 +56,8 @@ fi
 function blob_fixup() {
     case "${1}" in
         vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so)
-        hexdump -ve '1/1 "%.2X"' "${2}" | sed "s/210080529A0A0094/210080521F2003D5/g" | xxd -r -p > "${TMPDIR}/${1##*/}"
-        mv "${TMPDIR}/${1##*/}" "${2}"
-        ;;
+            "${SIGSCAN}" -p "E4 0A 00 94" -P "1F 20 03 D5" -f "${2}"
+            ;;
     esac
 }
 
diff --git a/manifest.xml b/manifest.xml
index fb88f1e..4eeb0aa 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -139,22 +139,12 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.light</name>
-        <transport>hwbinder</transport>
-        <version>2.0</version>
-        <interface>
-            <name>ILight</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.secure_element</name>
         <transport>hwbinder</transport>
         <version>1.2</version>
         <interface>
             <name>ISecureElement</name>
-            <instance>eSE1</instance>
             <instance>SIM1</instance>
         </interface>
     </hal>
@@ -514,7 +504,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
+    <!-- <hal format="hidl">
         <name>android.hardware.camera.provider</name>
         <transport>hwbinder</transport>
         <version>2.4</version>
@@ -522,7 +512,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <name>ICameraProvider</name>
             <instance>legacy/0</instance>
         </interface>
-    </hal>
+    </hal> -->
     <hal format="hidl">
         <name>vendor.qti.hardware.bluetooth_sar</name>
         <transport>hwbinder</transport>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index fc0b933..6fff30c 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -297,6 +297,8 @@ vendor/lib64/libswregistrationalgo.so
 vendor/lib64/libsynx.so
 vendor/lib64/libthreadutils.so
 vendor/lib64/libvidhance.so
+
+# Need Patch - Patch
 vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so
 
 # CDSP
@@ -552,7 +554,10 @@ vendor/firmware/lagoon_ipa_fws.mdt
 vendor/firmware/mcfcheck.txt
 
 # Fingerprint
-vendor/lib64/hw/fingerprint.fpc.default.so:vendor/lib64/hw/fingerprint.fpc.lito.so
+vendor/lib64/hw/fingerprint.fpc.default.so:vendor/lib64/hw/fingerprint.lito.so
+vendor/lib64/vendor.qti.hardware.fingerprint@1.0.so
+vendor/etc/init/vendor.fingerprint.rc
+vendor/bin/fingerprint
 
 # Gatekeeper
 vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti
@@ -819,10 +824,17 @@ vendor/lib64/unnhal-acc-hta.so
 vendor/lib64/unnhal-acc-hvx.so
 
 # NFC
+vendor/bin/hw/vendor.nxp.hardware.nfc@2.0-service
+vendor/etc/init/vendor.nxp.hardware.nfc@2.0-service.rc
+vendor/lib64/vendor.nxp.hardware.nfc@2.0.so
+vendor/lib/nfc_nci.nqx.default.hw.so
+vendor/bin/hw/vendor.nxp.hardware.nfc@2.0-service
+vendor/lib64/nfc_nci.nqx.default.hw.so
+vendor/lib64/se_nq_extn_client.so
 vendor/etc/libnfc-mtp-SN100.conf
 vendor/etc/libnfc-nci.conf
 vendor/etc/libnfc-qrd-SN100.conf
-vendor/lib/libsn100u_fw.so:vendor/lib64/libsn100u_fw.so
+vendor/lib64/libsn100u_fw.so
 
 # Peripheral manager
 vendor/bin/pm-proxy
@@ -1012,7 +1024,6 @@ vendor/radio/qcril_database/upgrade/7_version_update_ecc_table.sql
 vendor/radio/qcril_database/qcril.db
 
 # RIL (IMS)
--system_ext/app/ImsRcsService/ImsRcsService.apk
 system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml
 system_ext/framework/vendor.qti.ims.factory-V1.0-java.jar
 system_ext/framework/vendor.qti.ims.factory-V1.1-java.jar
diff --git a/rro_overlays/TelephonyOverlayBGT_sprout/res/values/config.xml b/rro_overlays/TelephonyOverlayBGT_sprout/res/values/config.xml
index efa68f1..2163d5b 100644
--- a/rro_overlays/TelephonyOverlayBGT_sprout/res/values/config.xml
+++ b/rro_overlays/TelephonyOverlayBGT_sprout/res/values/config.xml
@@ -26,7 +26,7 @@
     <string name="config_ims_mmtel_package">org.codeaurora.ims</string>
 
     <!-- String indicating the package name of the device ImsService implementation for RCS -->
-    <string name="config_ims_rcs_package">vendor.qti.imsrcs</string>
+    <string name="config_ims_rcs_package">org.codeaurora.ims</string>
 
     <!-- Package name for the call-based number verification app -->
     <string name="platform_number_verification_package" translatable="false">com.google.android.gms</string>