diff --git a/Android.mk b/Android.mk
index b0c4d7c..8f39db6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,11 +6,4 @@ LOCAL_PATH := $(call my-dir)
 
 ifeq ($(TARGET_DEVICE),avicii)
 
-$(info Including firmware for OnePlus Nord • avicii...)
-
-FIRMWARE_IMAGES := $(wildcard $(LOCAL_PATH)/firmware/*)
-
-$(foreach f, $(notdir $(FIRMWARE_IMAGES)), \
-    $(call add-radio-file,firmware/$(f)))
-
 endif
diff --git a/BoardConfigVendor.mk b/BoardConfigVendor.mk
index fd3e632..f2ea9a9 100644
--- a/BoardConfigVendor.mk
+++ b/BoardConfigVendor.mk
@@ -2,8 +2,3 @@
 #
 # This file is generated by device/oneplus/avicii/setup-makefiles.sh
 
-FIRMWARE_IMAGES := $(wildcard vendor/oneplus/avicii/firmware/*)
-
-AB_OTA_PARTITIONS += \
-    $(foreach f, $(notdir $(FIRMWARE_IMAGES)), $(basename $(f)))
-
diff --git a/avicii-vendor.mk b/avicii-vendor.mk
index 46bc096..1ff3ae9 100644
--- a/avicii-vendor.mk
+++ b/avicii-vendor.mk
@@ -220,6 +220,12 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/wfdvndservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wfdvndservice.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/izat.conf:$(TARGET_COPY_OUT_VENDOR)/etc/izat.conf \
     vendor/oneplus/avicii/proprietary/vendor/etc/lowi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/lowi.conf \
+    vendor/oneplus/avicii/proprietary/vendor/etc/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/media_codecs_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \
+    vendor/oneplus/avicii/proprietary/vendor/etc/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \
     vendor/oneplus/avicii/proprietary/vendor/etc/msm_irqbalance.conf:$(TARGET_COPY_OUT_VENDOR)/etc/msm_irqbalance.conf \
     vendor/oneplus/avicii/proprietary/vendor/etc/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml \
     vendor/oneplus/avicii/proprietary/vendor/etc/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt \
@@ -685,20 +691,8 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/odm/etc/acdbdata/Hdmi_cal.acdb:$(TARGET_COPY_OUT_ODM)/etc/acdbdata/Hdmi_cal.acdb \
     vendor/oneplus/avicii/proprietary/odm/etc/acdbdata/Headset_cal.acdb:$(TARGET_COPY_OUT_ODM)/etc/acdbdata/Headset_cal.acdb \
     vendor/oneplus/avicii/proprietary/odm/etc/acdbdata/Speaker_cal.acdb:$(TARGET_COPY_OUT_ODM)/etc/acdbdata/Speaker_cal.acdb \
-    vendor/oneplus/avicii/proprietary/odm/etc/camera/DAC_code.bin:$(TARGET_COPY_OUT_ODM)/etc/camera/DAC_code.bin \
-    vendor/oneplus/avicii/proprietary/odm/etc/camera/calibrationCfg.xml:$(TARGET_COPY_OUT_ODM)/etc/camera/calibrationCfg.xml \
-    vendor/oneplus/avicii/proprietary/odm/etc/camera/camera_engmode.xml:$(TARGET_COPY_OUT_ODM)/etc/camera/camera_engmode.xml \
-    vendor/oneplus/avicii/proprietary/odm/etc/camera/distortionParams.bin:$(TARGET_COPY_OUT_ODM)/etc/camera/distortionParams.bin \
-    vendor/oneplus/avicii/proprietary/odm/etc/camera/engineer_camera_config:$(TARGET_COPY_OUT_ODM)/etc/camera/engineer_camera_config \
     vendor/oneplus/avicii/proprietary/odm/etc/camera/fb_default:$(TARGET_COPY_OUT_ODM)/etc/camera/fb_default \
     vendor/oneplus/avicii/proprietary/odm/etc/camera/fwk_config.json:$(TARGET_COPY_OUT_ODM)/etc/camera/fwk_config.json \
-    vendor/oneplus/avicii/proprietary/odm/etc/camera/inputparam.xml:$(TARGET_COPY_OUT_ODM)/etc/camera/inputparam.xml \
-    vendor/oneplus/avicii/proprietary/odm/etc/camera/mwStereoParams.bin:$(TARGET_COPY_OUT_ODM)/etc/camera/mwStereoParams.bin \
-    vendor/oneplus/avicii/proprietary/odm/etc/camera/oplus_camera_algo_switch_config:$(TARGET_COPY_OUT_ODM)/etc/camera/oplus_camera_algo_switch_config \
-    vendor/oneplus/avicii/proprietary/odm/etc/camera/oplus_camera_config:$(TARGET_COPY_OUT_ODM)/etc/camera/oplus_camera_config \
-    vendor/oneplus/avicii/proprietary/odm/etc/camera/oplus_camera_zoom_config:$(TARGET_COPY_OUT_ODM)/etc/camera/oplus_camera_zoom_config \
-    vendor/oneplus/avicii/proprietary/odm/etc/camera/stereoParams_aftersale.bin:$(TARGET_COPY_OUT_ODM)/etc/camera/stereoParams_aftersale.bin \
-    vendor/oneplus/avicii/proprietary/odm/etc/camera/video_beauty_default_config:$(TARGET_COPY_OUT_ODM)/etc/camera/video_beauty_default_config \
     vendor/oneplus/avicii/proprietary/odm/etc/init/android.hardware.drm@1.3-service.widevine.rc:$(TARGET_COPY_OUT_ODM)/etc/init/android.hardware.drm@1.3-service.widevine.rc \
     vendor/oneplus/avicii/proprietary/odm/etc/init/vendor.oplus.hardware.biometrics.fingerprint@2.1-service.rc:$(TARGET_COPY_OUT_ODM)/etc/init/vendor.oplus.hardware.biometrics.fingerprint@2.1-service.rc \
     vendor/oneplus/avicii/proprietary/odm/etc/init/vendor.oplus.hardware.oplusSensor@1.0-service.rc:$(TARGET_COPY_OUT_ODM)/etc/init/vendor.oplus.hardware.oplusSensor@1.0-service.rc \
@@ -953,14 +947,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/odm/vendor/firmware/gfp9558.b06:$(TARGET_COPY_OUT_ODM)/vendor/firmware/gfp9558.b06 \
     vendor/oneplus/avicii/proprietary/odm/vendor/firmware/gfp9558.b07:$(TARGET_COPY_OUT_ODM)/vendor/firmware/gfp9558.b07 \
     vendor/oneplus/avicii/proprietary/odm/vendor/firmware/gfp9558.mdt:$(TARGET_COPY_OUT_ODM)/vendor/firmware/gfp9558.mdt \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmosal.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib/libmmparser_lite.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmmparser_lite.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/libmmosal.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmmosal.so \
-    vendor/oneplus/avicii/proprietary/system_ext/lib64/vendor.qti.imsrtpservice@3.1.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/vendor.qti.imsrtpservice@3.1.so \
-    vendor/oneplus/avicii/proprietary/vendor/bin/cnss-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/cnss-daemon \
-    vendor/oneplus/avicii/proprietary/vendor/bin/feature_enabler_client:$(TARGET_COPY_OUT_VENDOR)/bin/feature_enabler_client \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.bluetooth@1.0-service-qti \
-    vendor/oneplus/avicii/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.neuralnetworks@1.3-service-qti \
     vendor/oneplus/avicii/proprietary/vendor/bin/cnss-daemon:$(TARGET_COPY_OUT_VENDOR)/bin/cnss-daemon \
     vendor/oneplus/avicii/proprietary/vendor/bin/feature_enabler_client:$(TARGET_COPY_OUT_VENDOR)/bin/feature_enabler_client \
     vendor/oneplus/avicii/proprietary/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.bluetooth@1.0-service-qti \
@@ -987,7 +973,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/etc/camera/distortion_result.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/distortion_result.bin \
     vendor/oneplus/avicii/proprietary/vendor/etc/camera/distortion_result_front.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/distortion_result_front.bin \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.bluetooth@1.0-service-qti.rc \
-    vendor/oneplus/avicii/proprietary/vendor/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks@1.3-service-qti.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/feature_enabler_client.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/feature_enabler_client.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/init.vendor.sensors.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.vendor.sensors.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/ipa_fws.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/ipa_fws.rc \
@@ -998,14 +983,12 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.sensors.qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.sensors.qti.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/init/vendor.sensors.sscrpcd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.sensors.sscrpcd.rc \
     vendor/oneplus/avicii/proprietary/vendor/etc/ltm_config_samsung_ams644vk04_fhd_cmd_mode_dsc_dsi_panel.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ltm_config_samsung_ams644vk04_fhd_cmd_mode_dsc_dsi_panel.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml \
     vendor/oneplus/avicii/proprietary/vendor/etc/perf/commonresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonresourceconfigs.xml \
     vendor/oneplus/avicii/proprietary/vendor/etc/perf/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml \
     vendor/oneplus/avicii/proprietary/vendor/etc/perf/perfconfigstore.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfconfigstore.xml \
     vendor/oneplus/avicii/proprietary/vendor/etc/perf/targetconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetconfig.xml \
     vendor/oneplus/avicii/proprietary/vendor/etc/perf/targetresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetresourceconfigs.xml \
     vendor/oneplus/avicii/proprietary/vendor/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor-qti-hardware-sensorscalibrate.xml \
-    vendor/oneplus/avicii/proprietary/vendor/etc/public.libraries.txt:$(TARGET_COPY_OUT_VENDOR)/etc/public.libraries.txt \
     vendor/oneplus/avicii/proprietary/vendor/etc/qdcm_calib_data_samsung_ams644vk04_fhd_cmd_mode_dsc_dsi_panel.xml:$(TARGET_COPY_OUT_VENDOR)/etc/qdcm_calib_data_samsung_ams644vk04_fhd_cmd_mode_dsc_dsi_panel.xml \
     vendor/oneplus/avicii/proprietary/vendor/etc/sensors/config/alsps.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/alsps.json \
     vendor/oneplus/avicii/proprietary/vendor/etc/sensors/config/bmi160.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/bmi160.json \
@@ -1263,29 +1246,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.btconfigstore@1.0-impl.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/hw/vendor.qti.hardware.sensorscalibrate@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/hw/vendor.qti.hardware.sensorscalibrate@1.0-impl.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libAlgoProcess.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libAlgoProcess.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libFaceBeautyLiteCap.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libFaceBeautyLiteCap.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOPPO_Front_SCPortrait.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOPPO_Front_SCPortrait.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libOPPO_SCPortrait.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOPPO_SCPortrait.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libPlatformValidatorShared.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libPlatformValidatorShared.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libPolarrRender.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libPolarrRender.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libSNPE.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libSNPE.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libSonyIMX471RmscLibrary.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libSonyIMX471RmscLibrary.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libSuperSensor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libSuperSensor.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libSuperSensorFallback.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libSuperSensorFallback.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libSuperSensorProcessor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libSuperSensorProcessor.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libSuperSensorProcessorCWrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libSuperSensorProcessorCWrapper.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libVDBlurless.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libVDBlurless.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libVDDualCameraBlurlessAPI.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libVDDualCameraBlurlessAPI.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libVDFusionBlurlessAPI_v2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libVDFusionBlurlessAPI_v2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libVDSuperPhotoAPI.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libVDSuperPhotoAPI.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib_oneplus_transparenteffect.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib_oneplus_transparenteffect.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/lib_oneplus_watermark.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib_oneplus_watermark.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libadsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libadsprpc.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libaps_frame_registration.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libaps_frame_registration.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libapsdarksight.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libapsdarksight.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libapsexif.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libapsexif.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libapsjpeg.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libapsjpeg.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libPolarrRender.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libPolarrRender.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libadsprpc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libadsprpc.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libarcsoft_beautyshot.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libarcsoft_beautyshot.so \
@@ -1313,7 +1273,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libbluetooth_audio_session_qti.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbluetooth_audio_session_qti.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libbluetooth_audio_session_qti_2_1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbluetooth_audio_session_qti_2_1.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libbtnv.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbtnv.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libc++_shared.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libc++_shared.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libcamera2ndk_vendor.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamera2ndk_vendor.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libcamera_nn_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamera_nn_stub.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libcamerapostproc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcamerapostproc.so \
@@ -1341,17 +1300,11 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libdualcam_video_optical_zoom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdualcam_video_optical_zoom.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libdualcamirfusion.arcsoft.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libdualcamirfusion.arcsoft.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libhdr_tm.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhdr_tm.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libhexagon_nn_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhexagon_nn_stub.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libhistogram.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhistogram.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libhta_hexagon_runtime.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhta_hexagon_runtime.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libhistogram.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhistogram.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libipebpsstriping.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libipebpsstriping.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libmidasserviceintf.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmidasserviceintf.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libmmcamera_faceproc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmmcamera_faceproc.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libmmcamera_faceproc2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmmcamera_faceproc2.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libmmosal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmmosal.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libmorpho_dcface.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmorpho_dcface.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libmorpho_image_refiner_deflicker.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmorpho_image_refiner_deflicker.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libmpbase.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libmpbase.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libnanopb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libnanopb.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libofflinelog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libofflinelog.so \
@@ -1371,8 +1324,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsdmutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsdmutils.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsensorcal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsensorcal.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsensorslog.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsensorslog.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libsnpe_adsp.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnpe_adsp.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libsnpe_dsp_domains_v2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsnpe_dsp_domains_v2.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsns_device_mode_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsns_device_mode_stub.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsns_fastRPC_util.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsns_fastRPC_util.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsns_low_lat_stream_stub.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsns_low_lat_stream_stub.so \
@@ -1381,11 +1332,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsoc_helper.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsoc_helper.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libssc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssc.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libssc_default_listener.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libssc_default_listener.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libstblur_capture_api.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libstblur_capture_api.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libstdc++.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libstdc++.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libswregistrationalgo.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libswregistrationalgo.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libsymphony-cpu.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsymphony-cpu.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/libsymphonypower.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsymphonypower.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libswregistrationalgo.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libswregistrationalgo.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libsynx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libsynx.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libthreadutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libthreadutils.so \
@@ -1395,10 +1341,6 @@ PRODUCT_COPY_FILES += \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libtriplecam_video_optical_zoom.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtriplecam_video_optical_zoom.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/libtrustedapploader.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libtrustedapploader.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/sensors.ssc.so:$(TARGET_COPY_OUT_VENDOR)/lib64/sensors.ssc.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/unnhal-acc-adreno.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-adreno.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/unnhal-acc-common.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-common.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/unnhal-acc-hta.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-hta.so \
-    vendor/oneplus/avicii/proprietary/vendor/lib64/unnhal-acc-hvx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/unnhal-acc-hvx.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.display.color@1.0.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.display.color@1.0.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.display.color@1.1.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.display.color@1.1.so \
     vendor/oneplus/avicii/proprietary/vendor/lib64/vendor.display.color@1.2.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.display.color@1.2.so \
@@ -1421,8 +1363,6 @@ PRODUCT_PACKAGES += \
     HotwordEnrollmentOKGoogleHEXAGON \
     HotwordEnrollmentXGoogleHEXAGON \
     com.android.hotwordenrollment.common.util \
-    android.hardware.neuralnetworks@1.3-service-qti-hta \
-    android.hardware.neuralnetworks@1.3-service-qti \
     manifest_oplus_cameramdm \
     manifest_android.hardware.drm@1.3-service.widevine \
     manifest_oplusSensor \
diff --git a/proprietary/odm/etc/camera/DAC_code.bin b/proprietary/odm/etc/camera/DAC_code.bin
deleted file mode 100644
index 3f69f44..0000000
Binary files a/proprietary/odm/etc/camera/DAC_code.bin and /dev/null differ
diff --git a/proprietary/odm/etc/camera/calibrationCfg.xml b/proprietary/odm/etc/camera/calibrationCfg.xml
deleted file mode 100644
index e2939a1..0000000
--- a/proprietary/odm/etc/camera/calibrationCfg.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<opencv_storage>
-<CalibrationDefaultKeyValCount>12</CalibrationDefaultKeyValCount>
-<CalibrationDefaultKeyVal>"2000,1500,1152,864,944,708,0,0,0,10.85,0,0"</CalibrationDefaultKeyVal>
-<CalibrationThreshold>"120,120,100,100,15000,15000,3,3,3,1.5,1.5,2.2"</CalibrationThreshold>
-
-<CircleBoardInfoCount>7</CircleBoardInfoCount>
-<CircleBoardInfo>"8,8,21.25,4,8,-2,5"</CircleBoardInfo>
-
-<DistortionInputParaCount>5</DistortionInputParaCount>
-<DistortionInputPara>"1,7,7,8,6"</DistortionInputPara>
-<SubDistortionInputPara>"1,7,7,8,6"</SubDistortionInputPara>
-
-
-<AlgorithmInnerThresholdCount>19</AlgorithmInnerThresholdCount>
-<AlgorithmInnerThreshold>"35,85,0.84,1.0,0.9,25.0,3500.0,15,1.0,15.0,15.0,0.44444444,0.66666667,3,0.43,0.4,0.8,0.25,0.3"</AlgorithmInnerThreshold>
-
-<VerifyThresholdCount>8</VerifyThresholdCount>
-<VerifyThreshold>"20,1.8,3.0,8.0,12,200,30,50"</VerifyThreshold>
-
-<calibrationInputParaCount>4</calibrationInputParaCount>
-<calibrationInputPara>"3,1,1,50"</calibrationInputPara>
-
-<fOptRangeCount>4</fOptRangeCount>
-<fOptRange>"0.995,1.005,0.995,1.005"</fOptRange>
-
-<InputImagesFile>inputparam.xml</InputImagesFile>
-<loglevel>15</loglevel>
-<dumpflag>0</dumpflag>
-<chartAngle>4</chartAngle>
-<CalibMode>0</CalibMode>
-<CalibChart>0</CalibChart>
-
-<OutPutBinName>"stereoParams.bin"</OutPutBinName>
-<statisticsFilePath>D:/OPLUS_Data/DualCameraCalibReport.csv</statisticsFilePath>
-</opencv_storage>
diff --git a/proprietary/odm/etc/camera/camera_engmode.xml b/proprietary/odm/etc/camera/camera_engmode.xml
deleted file mode 100644
index b316935..0000000
--- a/proprietary/odm/etc/camera/camera_engmode.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<!--
-  Copyright (c) 2019 OPLUS Technologies, Inc.
-  All Rights Reserved.
-  Confidential and Proprietary - OPLUS Technologies, Inc.
--->
-<!--
-CameraEngmodeConfig :
-    This node must be added for each module prosent in the device.
-    It contain all information about the module present.
-    The number of nodes of CameraEngmodeConfig indicate number of modules
-    to be probed on the device.
-    Maximum number of CameraEngmodeConfig nodes is 10
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--->
-<CameraEngmodeRoot>
-  <CameraEngmodeConfig>
-    <CameraId>0</CameraId>
-    <SensorName>ov64b</SensorName>
-    <isAvailable>true</isAvailable>
-    <eepromCalib>
-      <isAvailable>true</isAvailable>
-      <MWdata>
-        <devIndex>6</devIndex>
-        <isWRP>0x1</isWRP>
-        <isAvailable>true</isAvailable>
-        <dataAddress>0x1E00</dataAddress>
-        <offset>0x1E00</offset>
-        <dataSize>1689</dataSize>
-        <!--first byte128-->
-        <Head1Src>0</Head1Src>
-        <Head1Dst>0</Head1Dst>
-        <Head1Size>128</Head1Size>
-        <!--second byte40-->
-        <Head2Src>128</Head2Src>
-        <Head2Dst>128</Head2Dst>
-        <Head2Size>40</Head2Size>
-        <!--internalPara main-->
-        <MainParamSrc>168</MainParamSrc>
-        <MainParamDst>168</MainParamDst>
-        <MainParamSize>1517</MainParamSize>
-        <!--internalPara aux-->
-        <AuxParamSrc>0</AuxParamSrc>
-        <AuxParamDst>0</AuxParamDst>
-        <AuxParamSize>0</AuxParamSize>
-        <!--externalPara-->
-        <extParamSrc>0</extParamSrc>
-        <extParamDst>0</extParamDst>
-        <extParamSize>0</extParamSize>
-        <!--endPara-->
-        <EndParamSrc>1685</EndParamSrc>
-        <EndParamDst>3226</EndParamDst>
-        <EndParamSize>4</EndParamSize>
-      </MWdata>
-      <MTdata>
-        <devIndex>6</devIndex>
-        <isWRP>0x1</isWRP>
-        <isAvailable>false</isAvailable>
-        <dataAddress>0x2500</dataAddress>
-        <offset>0x2500</offset>
-        <dataSize>1689</dataSize>
-      </MTdata>
-      <AEsyncdata>
-        <devIndex>6</devIndex>
-        <isWRP>0x1</isWRP>
-        <isAvailable>false</isAvailable>
-        <dataAddress>0x2C00</dataAddress>
-        <offset>0x2C00</offset>
-        <dataSize>36</dataSize>
-      </AEsyncdata>
-      <SN>
-        <devIndex>0x01</devIndex>
-        <isWRP>0</isWRP>
-        <isAvailable>true</isAvailable>
-        <dataAddress>0x00B0</dataAddress>
-        <offset>0x00B0</offset>
-        <dataSize>17</dataSize>
-      </SN>
-      <Distortiondata>
-        <devIndex>6</devIndex>
-        <isWRP>0</isWRP>
-        <isAvailable>false</isAvailable>
-        <dataAddress>0x2600</dataAddress>
-        <dataSize>36</dataSize>
-      </Distortiondata>
-	</eepromCalib>
-  </CameraEngmodeConfig>
-  <CameraEngmodeConfig>
-    <CameraId>1</CameraId>
-    <SensorName>hi846</SensorName>
-    <isAvailable>true</isAvailable>
-    <eepromCalib>
-      <isAvailable>true</isAvailable>
-      <MWdata>
-          <devIndex>7</devIndex>
-          <isWRP>0x1</isWRP>
-          <isAvailable>true</isAvailable>
-          <dataAddress>0x1A40</dataAddress>
-          <offset>0x1A40</offset>
-          <dataSize>1561</dataSize>
-        <!--first byte128-->
-        <Head1Src>0</Head1Src>
-        <Head1Dst>0</Head1Dst>
-        <Head1Size>0</Head1Size>
-        <!--second byte40-->
-        <Head2Src>0</Head2Src>
-        <Head2Dst>0</Head2Dst>
-        <Head2Size>0</Head2Size>
-        <!--internalPara main-->
-        <MainParamSrc>0</MainParamSrc>
-        <MainParamDst>0</MainParamDst>
-        <MainParamSize>0</MainParamSize>
-        <!--internalPara aux-->
-        <AuxParamSrc>0</AuxParamSrc>
-        <AuxParamDst>1685</AuxParamDst>
-        <AuxParamSize>1517</AuxParamSize>
-        <!--externalPara-->
-        <extParamSrc>0</extParamSrc>
-        <extParamDst>0</extParamDst>
-        <extParamSize>0</extParamSize>
-        <!--endPara-->
-        <EndParamSrc>0</EndParamSrc>
-        <EndParamDst>0</EndParamDst>
-        <EndParamSize>0</EndParamSize>
-      </MWdata>
-      <MTdata>
-          <devIndex>7</devIndex>
-          <isWRP>0x1</isWRP>
-          <isAvailable>false</isAvailable>
-          <dataAddress>0x540</dataAddress>
-          <offset>0x540</offset>
-          <dataSize>1561</dataSize>
-      </MTdata>
-      <AEsyncdata>
-          <devIndex>7</devIndex>
-          <isWRP>0x1</isWRP>
-          <isAvailable>false</isAvailable>
-          <dataAddress>0xC00</dataAddress>
-          <offset>0xC00</offset>
-          <dataSize>36</dataSize>
-      </AEsyncdata>
-      <SN>
-          <devIndex>0x02</devIndex>
-          <isWRP>0x0</isWRP>
-          <isAvailable>true</isAvailable>
-          <dataAddress>0x00B0</dataAddress>
-          <offset>0x00B0</offset>
-          <dataSize>17</dataSize>
-      </SN>
-      <Distortiondata>
-          <devIndex>7</devIndex>
-          <isWRP>0x1</isWRP>
-          <isAvailable>true</isAvailable>
-          <dataAddress>0xCA0</dataAddress>
-          <offset>0xCA0</offset>
-          <dataSize>3441</dataSize>
-      </Distortiondata>
-    </eepromCalib>
-  </CameraEngmodeConfig>
-</CameraEngmodeRoot>
diff --git a/proprietary/odm/etc/camera/distortionParams.bin b/proprietary/odm/etc/camera/distortionParams.bin
deleted file mode 100644
index 90074c9..0000000
Binary files a/proprietary/odm/etc/camera/distortionParams.bin and /dev/null differ
diff --git a/proprietary/odm/etc/camera/engineer_camera_config b/proprietary/odm/etc/camera/engineer_camera_config
deleted file mode 100644
index 8c3200b..0000000
--- a/proprietary/odm/etc/camera/engineer_camera_config
+++ /dev/null
@@ -1,771 +0,0 @@
-[
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.flash.light.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "1"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.rear.single.flash.light.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.flash.light.front.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.flash.light.calibrate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "1"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.flash.light.auto.calibrate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "1"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.second.back.camera.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "1"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.third.rear.camera.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "1"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.fourth.rear.camera.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "1"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.new.triple.calibrate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "1"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.new.triple.verificate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "1"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.interference.video.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "1"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.ois.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.focus.motor.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "1"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.ae.sync.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.ois.noise.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.pdaf.calibrate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.laser.focus.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.third.rear.camera.ois.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.eis.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.aperture.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.tof.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.tof.depth.calibrate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.tof.calibrate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.tof.verificate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.ir.camera.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.ir.camera.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.dual.calibrate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.dual.verificate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.triple.calibrate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.triple.verificate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.zoom.loop.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.arcsoft.calibrate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.arcsoft.verificate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.aftersale.top.tip.array",
-		"Type": "Int32",
-		"Count": "2",
-		"Value": "543,280"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.aftersale.bottom.tip.array",
-		"Type": "Int32",
-		"Count": "2",
-		"Value": "543,1180"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.triple.calibrate.aftersale.focus.lens",
-		"Type": "Int32",
-		"Count": "1",
-		"Value": "3000"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.dual.calibrate.aftersale.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.triple.calibrate.aftersale.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.calibration.rear.size",
-		"Type": "Int32",
-		"Count": "2",
-		"Value": "4624x3468"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.calibrate.second.rear.size",
-		"Type": "Int32",
-		"Count": "2",
-		"Value": "2304x1728"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.calibrate.third.rear.size",
-		"Type": "Int32",
-		"Count": "2",
-		"Value": "4000x3000"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.portrait.size",
-		"Type": "Int32",
-		"Count": "2",
-		"Value": "4624x3468"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.ae.sync.rear.size",
-		"Type": "Int32",
-		"Count": "2",
-		"Value": "4624x3468"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.ae.sync.second.rear.size",
-		"Type": "Int32",
-		"Count": "2",
-		"Value": "2304x1728"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.ae.sync.third.rear.size",
-		"Type": "Int32",
-		"Count": "2",
-		"Value": "4000x3000"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.dual.calibration.input.yuv.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.dual.calibration.buffer.lost.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.aftersale.chart.size.array",
-		"Type": "Int32",
-		"Count": "4",
-		"Value": "275,455,805,985"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.second.rear.flash.light.calibrate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.third.rear.flash.light.calibrate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.fourth.rear.flash.light.calibrate.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.calibration.performance",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.portrait.fullbody.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.hidl.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.calibrate.project.name",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-	
-    {
-		"VendorTag": "com.oplus.engineercamera.configure.second.front.camera.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "1"
-	},
-	
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.calibration.algo",
-		"Type": "String",
-		"Count": "1",
-		"Value": "cp"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.calibration.params.name",
-		"Type": "String",
-		"Count": "1",
-		"Value": "CalibrationOppoC.json"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.verification.params.name",
-		"Type": "String",
-		"Count": "1",
-		"Value": "VerificationOppoC.json"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.calibration.yshift",
-		"Type": "Float",
-		"Count": "1",
-		"Value": "10.15"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.calibration.zshift",
-		"Type": "Float",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.calibration.roll",
-		"Type": "Float",
-		"Count": "1",
-		"Value": "1.45"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.oiscalibration.params.name",
-		"Type": "String",
-		"Count": "1",
-		"Value": ""
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.oiscalibration.rear.size",
-		"Type": "Int32",
-		"Count": "2",
-		"Value": "4624x3468"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.oiscalibrate.second.rear.size",
-		"Type": "Int32",
-		"Count": "2",
-		"Value": "2592x1940"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.oisverification.params.name",
-		"Type": "String",
-		"Count": "1",
-		"Value": ""
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.laser.focus.aging.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.new.sfr.support",
-		"Value": "1"
-	},
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.rear.sfr.fov",
-		"Value": " 0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.rear.sfr.fov.selected",
-		"Value": "0,0.3,0.5,0.7,0.8"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.rear.sfr.offset",
-		"Value": "0,0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.rear.sfr.roi.count",
-		"Value": "19"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.rear.sfr.crop.size",
-		"Value": "400"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.second.rear.sfr.fov",
-		"Value": " 0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.second.rear.sfr.fov.selected",
-		"Value": "0,0.3,0.5,0.7,0.8"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.second.rear.sfr.offset",
-		"Value": "0,0 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.second.rear.sfr.roi.count",
-		"Value": "19"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.second.rear.sfr.crop.size",
-		"Value": "400"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.third.rear.sfr.fov",
-		"Value": " 0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.third.rear.sfr.fov.selected",
-		"Value": "0,0.25,0.3,0.4,0.6,0.8"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.third.rear.sfr.offset",
-		"Value": "0,0 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.third.rear.sfr.roi.count",
-		"Value": "21"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.third.rear.sfr.crop.size",
-		"Value": "200"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.fourth.rear.sfr.fov",
-		"Value": " 0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.fourth.rear.sfr.fov.selected",
-		"Value": "0,0.25,0.3,0.4,0.6,0.8"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.fourth.rear.sfr.offset",
-		"Value": "0,0 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.fourth.rear.sfr.roi.count",
-		"Value": "21"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.fourth.rear.sfr.crop.size",
-		"Value": "200"
-	},
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.front.sfr.fov",
-		"Value": " 0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.front.sfr.fov.selected",
-		"Value": "0,0.3,0.5,0.7,0.8"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.front.sfr.offset",
-		"Value": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,0,-200,0,200,0,-200"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.front.sfr.roi.count",
-		"Value": "19"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.front.sfr.crop.size",
-		"Value": "400"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.front.sfr.fov",
-		"Value": " 0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.new.sfr.support",
-		"Value": "1"
-	},
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.rear.sfr.fov",
-		"Value": " 0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.rear.sfr.fov.selected",
-		"Value": "0,0.3,0.5,0.7,0.8"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.rear.sfr.offset",
-		"Value": "0,0"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.rear.sfr.roi.count",
-		"Value": "19"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.rear.sfr.crop.size",
-		"Value": "400"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.second.rear.sfr.fov",
-		"Value": " 0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.second.rear.sfr.fov.selected",
-		"Value": "0,0.3,0.5,0.7,0.8"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.second.rear.sfr.offset",
-		"Value": "0,0 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.second.rear.sfr.roi.count",
-		"Value": "19"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.second.rear.sfr.crop.size",
-		"Value": "400"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.third.rear.sfr.fov",
-		"Value": " 0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.third.rear.sfr.fov.selected",
-		"Value": "0,0.25,0.3,0.4,0.6,0.8"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.third.rear.sfr.offset",
-		"Value": "0,0 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.third.rear.sfr.roi.count",
-		"Value": "21"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.third.rear.sfr.crop.size",
-		"Value": "200"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.fourth.rear.sfr.fov",
-		"Value": " 0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.fourth.rear.sfr.fov.selected",
-		"Value": "0,0.25,0.3,0.4,0.6,0.8"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.fourth.rear.sfr.offset",
-		"Value": "0,0 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.fourth.rear.sfr.roi.count",
-		"Value": "21"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.fourth.rear.sfr.crop.size",
-		"Value": "200"
-	},
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.front.sfr.fov",
-		"Value": " 0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.front.sfr.fov.selected",
-		"Value": "0,0.3,0.5,0.7,0.8"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.front.sfr.offset",
-		"Value": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,0,-200,0,200,0,-200"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.front.sfr.roi.count",
-		"Value": "19"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.front.sfr.crop.size",
-		"Value": "400"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.front.sfr.fov",
-		"Value": " 0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95 "
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.supervideo.support",
-		"Type": "Byte",
-		"Count": "1",
-		"Value": "0"
-	},
-
-        {
-                "VendorTag": "com.oplus.engineercamera.configure.calibrate.second.rear.distortion.size",
-                "Type": "Int32",
-                "Count": "2",
-                "Value": "2304x1728"
-        },
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.ae.sync.rear.exposuretime",
-		"Type": "Int32",
-		"Count": "1",
-		"Value": "12000000"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.ae.sync.second.rear.exposuretime",
-		"Type": "Int32",
-		"Count": "1",
-		"Value": "14000000"
-	},
-
-	{
-		"VendorTag": "com.oplus.engineercamera.configure.ae.sync.third.rear.exposuretime",
-		"Type": "Int32",
-		"Count": "1",
-		"Value": "44000000"
-	}
-]
diff --git a/proprietary/odm/etc/camera/inputparam.xml b/proprietary/odm/etc/camera/inputparam.xml
deleted file mode 100644
index a470f4c..0000000
--- a/proprietary/odm/etc/camera/inputparam.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<opencv_storage>
-<rgb0>RGB_0.bmp</rgb0>
-<ir0>IR_0.bmp</ir0>
-</opencv_storage>
diff --git a/proprietary/odm/etc/camera/mwStereoParams.bin b/proprietary/odm/etc/camera/mwStereoParams.bin
deleted file mode 100644
index c637442..0000000
Binary files a/proprietary/odm/etc/camera/mwStereoParams.bin and /dev/null differ
diff --git a/proprietary/odm/etc/camera/oplus_camera_algo_switch_config b/proprietary/odm/etc/camera/oplus_camera_algo_switch_config
deleted file mode 100644
index c7234e2..0000000
--- a/proprietary/odm/etc/camera/oplus_camera_algo_switch_config
+++ /dev/null
@@ -1,362 +0,0 @@
-{
-	"aps_enable" : 1,
-	"aps_configs" : [
-		{
-			"mode" : "common",
-			"entity" : [
-				{
-					"id" : 0,
-					"enable" : 1,
-					"aps_algo_blurless" : 1,
-					"aps_algo_bokeh" : 0,
-					"aps_algo_hdr" : 1,
-					"aps_algo_lowlight_hdr" : 1,
-					"aps_algo_raw_hdr" : 0,
-					"aps_algo_pf" : 1,
-					"aps_algo_fusion" : 1,
-					"aps_algo_ai_night" : 0,
-					"aps_algo_rectify" : 1,
-					"aps_algo_supernight" : 0,
-					"aps_algo_superphoto" : 1,
-					"aps_algo_watermark" : 1,
-					"aps_algo_face_beauty" : 1,
-					"aps_algo_rotate_mirror" : 1,
-					"aps_algo_filter" : 1,
-					"aps_algo_single_blur" : 0,
-					"aps_algo_upscale" : 1,
-					"aps_algo_video_blur" : 0
-				},
-				{
-					"id" : 1,
-					"enable" : 1,
-					"aps_algo_blurless" : 1,
-					"aps_algo_bokeh" : 0,
-					"aps_algo_hdr" : 1,
-					"aps_algo_lowlight_hdr" : 1,
-					"aps_algo_raw_hdr" : 0,
-					"aps_algo_pf" : 0,
-					"aps_algo_fusion" : 0,
-					"aps_algo_ai_night" : 0,
-					"aps_algo_rectify" : 0,
-					"aps_algo_supernight" : 0,
-					"aps_algo_superphoto" : 0,
-					"aps_algo_watermark" : 1,
-					"aps_algo_face_beauty" : 1,
-					"aps_algo_rotate_mirror" : 1,
-					"aps_algo_filter" : 1,
-					"aps_algo_single_blur" : 0,
-					"aps_algo_upscale" : 1,
-					"aps_algo_video_blur" : 0
-				}
-			]
-		},
-		{
-			"mode" : "night",
-			"entity" : [
-				{
-					"id" : 0,
-					"enable" : 1,
-					"aps_algo_blurless" : 1,
-					"aps_algo_bokeh" : 0,
-					"aps_algo_hdr" : 1,
-					"aps_algo_lowlight_hdr" : 0,
-					"aps_algo_raw_hdr" : 0,
-					"aps_algo_pf" : 0,
-					"aps_algo_fusion" : 0,
-					"aps_algo_ai_night" : 1,
-					"aps_algo_rectify" : 1,
-					"aps_algo_supernight" : 1,
-					"aps_algo_superphoto" : 1,
-					"aps_algo_watermark" : 1,
-					"aps_algo_face_beauty" : 0,
-					"aps_algo_rotate_mirror" : 1,
-					"aps_algo_filter" : 0,
-					"aps_algo_single_blur" : 0,
-					"aps_algo_upscale" : 1,
-					"aps_algo_video_blur" : 0,
-					"aps_algo_darksight" : 1
-				},
-				{
-					"id" : 1,
-					"enable" : 1,
-					"aps_algo_none" : 1
-				}
-			]
-		},
-		{
-			"mode" : "portrait",
-			"entity" : [
-				{
-					"id" : 0,
-					"enable" : 1,
-					"aps_algo_blurless" : 0,
-					"aps_algo_bokeh" : 1,
-					"aps_algo_hdr" : 0,
-					"aps_algo_lowlight_hdr" : 0,
-					"aps_algo_raw_hdr" : 0,
-					"aps_algo_pf" : 0,
-					"aps_algo_fusion" : 0,
-					"aps_algo_ai_night" : 0,
-					"aps_algo_rectify" : 0,
-					"aps_algo_supernight" : 0,
-					"aps_algo_superphoto" : 0,
-					"aps_algo_watermark" : 1,
-					"aps_algo_face_beauty" : 1,
-					"aps_algo_rotate_mirror" : 1,
-					"aps_algo_filter" : 1,
-					"aps_algo_single_blur" : 0,
-					"aps_algo_upscale" : 1,
-					"aps_algo_video_blur" : 0
-				},
-				{
-					"id" : 1,
-					"enable" : 1,
-					"aps_algo_blurless" : 1,
-					"aps_algo_bokeh" : 0,
-					"aps_algo_hdr" : 1,
-					"aps_algo_lowlight_hdr" : 1,
-					"aps_algo_raw_hdr" : 0,
-					"aps_algo_pf" : 0,
-					"aps_algo_fusion" : 0,
-					"aps_algo_ai_night" : 0,
-					"aps_algo_rectify" : 0,
-					"aps_algo_supernight" : 0,
-					"aps_algo_superphoto" : 0,
-					"aps_algo_watermark" : 1,
-					"aps_algo_face_beauty" : 1,
-					"aps_algo_rotate_mirror" : 1,
-					"aps_algo_filter" : 1,
-					"aps_algo_single_blur" : 1,
-					"aps_algo_upscale" : 1,
-					"aps_algo_video_blur" : 0
-				}
-			]
-		},
-		{
-			"mode" : "panorama",
-			"entity" : [
-				{
-					"id" : 0,
-					"enable" : 1,
-					"aps_algo_none" : 1
-				},
-				{
-					"id" : 1,
-					"enable" : 1,
-					"aps_algo_none" : 1
-				}
-			]
-		},
-		{
-			"mode" : "professional",
-			"entity" : [
-				{
-					"id" : 0,
-					"enable" : 1,
-					"aps_algo_blurless" : 1,
-					"aps_algo_bokeh" : 0,
-					"aps_algo_hdr" : 1,
-					"aps_algo_lowlight_hdr" : 1,
-					"aps_algo_raw_hdr" : 0,
-					"aps_algo_pf" : 0,
-					"aps_algo_fusion" : 0,
-					"aps_algo_ai_night" : 0,
-					"aps_algo_rectify" : 1,
-					"aps_algo_supernight" : 0,
-					"aps_algo_superphoto" : 1,
-					"aps_algo_watermark" : 1,
-					"aps_algo_face_beauty" : 0,
-					"aps_algo_rotate_mirror" : 1,
-					"aps_algo_filter" : 1,
-					"aps_algo_single_blur" : 0,
-					"aps_algo_upscale" : 1,
-					"aps_algo_video_blur" : 0
-				},
-				{
-					"id" : 1,
-					"enable" : 1,
-					"aps_algo_none" : 1
-				}
-			]
-		},
-		{
-			"mode" : "sticker",
-			"entity" : [
-				{
-					"id" : 0,
-					"enable" : 1,
-					"aps_algo_blurless" : 1,
-					"aps_algo_bokeh" : 0,
-					"aps_algo_hdr" : 1,
-					"aps_algo_lowlight_hdr" : 1,
-					"aps_algo_raw_hdr" : 0,
-					"aps_algo_pf" : 1,
-					"aps_algo_fusion" : 0,
-					"aps_algo_ai_night" : 1,
-					"aps_algo_rectify" : 1,
-					"aps_algo_supernight" : 1,
-					"aps_algo_superphoto" : 1,
-					"aps_algo_watermark" : 1,
-					"aps_algo_face_beauty" : 1,
-					"aps_algo_rotate_mirror" : 1,
-					"aps_algo_filter" : 1,
-					"aps_algo_single_blur" : 0,
-					"aps_algo_upscale" : 1,
-					"aps_algo_video_blur" : 0
-				},
-				{
-					"id" : 1,
-					"enable" : 1,
-					"aps_algo_blurless" : 1,
-					"aps_algo_bokeh" : 0,
-					"aps_algo_hdr" : 1,
-					"aps_algo_lowlight_hdr" : 1,
-					"aps_algo_raw_hdr" : 0,
-					"aps_algo_pf" : 1,
-					"aps_algo_fusion" : 0,
-					"aps_algo_ai_night" : 1,
-					"aps_algo_rectify" : 1,
-					"aps_algo_supernight" : 1,
-					"aps_algo_superphoto" : 1,
-					"aps_algo_watermark" : 1,
-					"aps_algo_face_beauty" : 1,
-					"aps_algo_rotate_mirror" : 1,
-					"aps_algo_filter" : 1,
-					"aps_algo_single_blur" : 0,
-					"aps_algo_upscale" : 1,
-					"aps_algo_video_blur" : 0
-				}
-			]
-		},
-		{
-			"mode" : "commonVideo",
-			"entity" : [
-				{
-					"id" : 0,
-					"enable" : 1,
-					"aps_algo_blurless" : 0,
-					"aps_algo_bokeh" : 0,
-					"aps_algo_hdr" : 0,
-					"aps_algo_lowlight_hdr" : 0,
-					"aps_algo_raw_hdr" : 0,
-					"aps_algo_pf" : 0,
-					"aps_algo_fusion" : 0,
-					"aps_algo_ai_night" : 0,
-					"aps_algo_rectify" : 1,
-					"aps_algo_supernight" : 0,
-					"aps_algo_superphoto" : 0,
-					"aps_algo_watermark" : 1,
-					"aps_algo_face_beauty" : 1,
-					"aps_algo_rotate_mirror" : 1,
-					"aps_algo_filter" : 1,
-					"aps_algo_single_blur" : 0,
-					"aps_algo_upscale" : 1,
-					"aps_algo_video_blur" : 1
-				},
-				{
-					"id" : 1,
-					"enable" : 1,
-					"aps_algo_blurless" : 0,
-					"aps_algo_bokeh" : 0,
-					"aps_algo_hdr" : 0,
-					"aps_algo_lowlight_hdr" : 0,
-					"aps_algo_raw_hdr" : 0,
-					"aps_algo_pf" : 0,
-					"aps_algo_fusion" : 0,
-					"aps_algo_ai_night" : 0,
-					"aps_algo_rectify" : 0,
-					"aps_algo_supernight" : 0,
-					"aps_algo_superphoto" : 0,
-					"aps_algo_watermark" : 1,
-					"aps_algo_face_beauty" : 1,
-					"aps_algo_rotate_mirror" : 1,
-					"aps_algo_filter" : 1,
-					"aps_algo_single_blur" : 0,
-					"aps_algo_upscale" : 1,
-					"aps_algo_video_blur" : 1
-				}
-			]
-		},
-		{
-			"mode" : "fastVideo",
-			"entity" : [
-				{
-					"id" : 0,
-					"enable" : 1,
-					"aps_algo_blurless" : 0,
-					"aps_algo_bokeh" : 0,
-					"aps_algo_hdr" : 0,
-					"aps_algo_lowlight_hdr" : 0,
-					"aps_algo_raw_hdr" : 0,
-					"aps_algo_pf" : 0,
-					"aps_algo_fusion" : 0,
-					"aps_algo_ai_night" : 0,
-					"aps_algo_rectify" : 0,
-					"aps_algo_supernight" : 0,
-					"aps_algo_superphoto" : 0,
-					"aps_algo_watermark" : 1,
-					"aps_algo_face_beauty" : 0,
-					"aps_algo_rotate_mirror" : 1,
-					"aps_algo_filter" : 1,
-					"aps_algo_single_blur" : 0,
-					"aps_algo_upscale" : 1,
-					"aps_algo_video_blur" : 1
-				},
-				{
-					"id" : 1,
-					"enable" : 1,
-					"aps_algo_blurless" : 0,
-					"aps_algo_bokeh" : 0,
-					"aps_algo_hdr" : 0,
-					"aps_algo_lowlight_hdr" : 0,
-					"aps_algo_raw_hdr" : 0,
-					"aps_algo_pf" : 0,
-					"aps_algo_fusion" : 0,
-					"aps_algo_ai_night" : 0,
-					"aps_algo_rectify" : 0,
-					"aps_algo_supernight" : 0,
-					"aps_algo_superphoto" : 0,
-					"aps_algo_watermark" : 1,
-					"aps_algo_face_beauty" : 0,
-					"aps_algo_rotate_mirror" : 1,
-					"aps_algo_filter" : 1,
-					"aps_algo_single_blur" : 0,
-					"aps_algo_upscale" : 1,
-					"aps_algo_video_blur" : 1
-				}
-			]
-		},
-		{
-			"mode" : "slowVideo",
-			"entity" : [
-				{
-					"id" : 0,
-					"enable" : 1,
-					"aps_algo_blurless" : 0,
-					"aps_algo_bokeh" : 0,
-					"aps_algo_hdr" : 0,
-					"aps_algo_lowlight_hdr" : 0,
-					"aps_algo_raw_hdr" : 0,
-					"aps_algo_pf" : 0,
-					"aps_algo_fusion" : 0,
-					"aps_algo_ai_night" : 0,
-					"aps_algo_rectify" : 0,
-					"aps_algo_supernight" : 0,
-					"aps_algo_superphoto" : 0,
-					"aps_algo_watermark" : 1,
-					"aps_algo_face_beauty" : 0,
-					"aps_algo_rotate_mirror" : 1,
-					"aps_algo_filter" : 1,
-					"aps_algo_single_blur" : 0,
-					"aps_algo_upscale" : 1,
-					"aps_algo_video_blur" : 1
-				},
-				{
-					"id" : 1,
-					"enable" : 1,
-					"aps_algo_none" : 1
-				}
-			]
-		}
-	]
-}
diff --git a/proprietary/odm/etc/camera/oplus_camera_config b/proprietary/odm/etc/camera/oplus_camera_config
deleted file mode 100644
index 3842b11..0000000
--- a/proprietary/odm/etc/camera/oplus_camera_config
+++ /dev/null
@@ -1,466 +0,0 @@
-[
-
-{
-  "VendorTag": "com.oplus.feature.auto.night.scence.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.video.eis.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.tunning.video.eis.preview.scale",
-  "Type": "Float",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.tunning.front.panorama.max.height",
-  "Type": "Int32",
-  "Count": "1",
-  "Value": "1920"
-},
-
-{
-  "VendorTag": "com.oplus.tunning.back.portrait.normal.picturesize",
-  "Type": "Int32",
-  "Count": "2",
-  "Value": "4000x3000"
-},
-
-{
-  "VendorTag": "com.oplus.high.picturesize",
-  "Type": "Int32",
-  "Count": "2",
-  "Value": "8000x6000"
-},
-
-{
-  "VendorTag": "com.oplus.sat.ultra.support.imagesizes",
-  "Type": "Int32",
-  "Count": "8",
-  "Value": "3264x2448x3264x1836x3200x1440x2448x2448"
-},
-
-{
-  "VendorTag": "com.oplus.sat.tele.support.imagesizes",
-  "Type": "Int32",
-  "Count": "8",
-  "Value": "4000x3000x4000x2250x4000x1800x3000x3000"
-},
-
-{
-  "VendorTag": "com.oplus.feature.sticker.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.suppernight.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.portrait.new.style.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.tunning.panorama.front.to.rear.switchtime",
-  "Type": "Int32",
-  "Count": "1",
-  "Value": "750"
-},
-
-{
-  "VendorTag": "com.oplus.tunning.panorama.rear.to.front.switchtime",
-  "Type": "Int32",
-  "Count": "1",
-  "Value": "750"
-},
-
-{
-  "VendorTag": "com.oplus.feature.burstshot.thumb.anim.step.time",
-  "Type": "Int32",
-  "Count": "1",
-  "Value": "35"
-},
-
-{
-  "VendorTag": "com.oplus.tunning.temperature.ultimate.limit",
-  "Type": "Int32",
-  "Count": "1",
-  "Value": "480"
-},
-
-{
-  "VendorTag": "com.oplus.feature.postcapture.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "0"
-},
-
-{
-  "VendorTag": "com.oplus.feature.postprocess.savejpeg.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.vivid.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "0"
-},
-
-{
-  "VendorTag": "com.oplus.feature.postview.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.googlelens.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "0"
-},
-
-{
-  "VendorTag": "com.oplus.feature.beauty3d.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "0"
-},
-
-{
-  "VendorTag": "com.oplus.feature.back.omoji.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.front.omoji.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.pi.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.tunning.1080p.hfr.fps",
-  "Type": "Int32",
-  "Count": "1",
-  "Value": "120"
-},
-
-{
-  "VendorTag": "com.oplus.tunning.720p.hfr.fps",
-  "Type": "Int32",
-  "Count": "1",
-  "Value": "240"
-},
-
-{
-  "VendorTag": "com.oplus.tunning.front.to.rear.switchtime",
-  "Type": "Int32",
-  "Count": "1",
-  "Value": "600"
-},
-
-{
-  "VendorTag": "com.oplus.tunning.rear.to.front.switchtime",
-  "Type": "Int32",
-  "Count": "1",
-  "Value": "900"
-},
-
-{
-  "VendorTag": "com.oplus.feature.video.4k.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.photo.3d.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "0"
-},
-
-{
-  "VendorTag": "com.oplus.tunning.portrait.capture.delay",
-  "Type": "Int32",
-  "Count": "1",
-  "Value": "300"
-},
-
-{
-  "VendorTag": "com.oplus.feature.slowvideo.1080p.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.video.720p.60fps.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.video.1080p.60fps.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.video.4k.60fps.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "0"
-},
-
-{
-  "VendorTag": "com.oplus.feature.motor.flashlight.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "0"
-},
-
-{
-  "VendorTag": "com.oplus.tunning.super.night.camera.mode",
-  "Type": "Int32",
-  "Count": "1",
-  "Value": "1057"
-},
-
-{
-  "VendorTag": "com.oplus.feature.portrait.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.3hdr.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "0"
-},
-
-{
-  "VendorTag": "com.oplus.feature.torch.softlight.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "0"
-},
-
-{
-  "VendorTag": "com.oplus.facebeauty.version",
-  "Type": "Int32",
-  "Count": "1",
-  "Value": "6"
-},
-
-{
-  "VendorTag": "com.oplus.feature.DCIP3.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.high.picturesize.yuv",
-  "Type": "Int32",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.video.sat.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.sat.superphoto.zoom.ratio.range",
-  "Type": "Float",
-  "Count": "1",
-  "Value": "1.5,1.9,2.5,20"
-},
-
-{
-  "VendorTag": "com.oplus.sat.fusion.zoom.ratio.range",
-  "Type": "Float",
-  "Count": "1",
-  "Value": "0.7,0.9"
-},
-
-{
-  "VendorTag": "com.oplus.sat.hdr.fusion.zoom.ratio.range",
-  "Type": "Float",
-  "Count": "1",
-  "Value": "0.59,0.69"
-},
-
-{
-  "VendorTag": "com.oplus.sat.hdr.zoom.ratio.range",
-  "Type": "Float",
-  "Count": "1",
-  "Value": "0.99,1.09"
-},
-
-{
-  "VendorTag": "com.oplus.sat.normal.zoom.ratio.range",
-  "Type": "Float",
-  "Count": "1",
-  "Value": "1.1,1.4,2.0,2.4"
-},
-
-{
-  "VendorTag": "com.oplus.super.night.range.max.zoom.ratio",
-  "Type": "Float",
-  "Count": "1",
-  "Value": "-1"
-},
-
-{
-  "VendorTag": "com.oplus.sat.ultrawide.zoom.range",
-  "Type": "Float",
-  "Count": "1",
-  "Value": "0.6,1.0"
-},
-
-{
-  "VendorTag": "com.oplus.sat.main.zoom.range",
-  "Type": "Float",
-  "Count": "1",
-  "Value": "1.0,2.0"
-},
-
-{
-  "VendorTag": "com.oplus.feature.video.super.eis.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.ultrawide.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.video.super.eis.wide.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.sat.tele.zoom.range",
-  "Type": "Float",
-  "Count": "1",
-  "Value": "2.0,20.0"
-},
-
-{
-  "VendorTag": "com.oplus.feature.video.eis.fps",
-  "Type": "Int32",
-  "Count": "1",
-  "Value": "60"
-},
-
-{
-  "VendorTag": "com.oplus.bokeh.beauty.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.video.eis.af.auto.lock",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.end.video.eis.stream.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.video.eis.fps.setting.suppot",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "0"
-},
-
-{
-  "VendorTag": "com.oplus.feature.video.super.eis.wide.60fps.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "0"
-},
-
-{
-  "VendorTag": "com.oplus.night.tripod.zoom.hide.ultra.wide.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.af.hyperfocaldistance",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "0"
-},
-
-{
-  "VendorTag": "com.oplus.feature.movie.mode.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-},
-
-{
-  "VendorTag": "com.oplus.feature.slogan.location.support",
-  "Type": "Byte",
-  "Count": "1",
-  "Value": "1"
-}
-
-]
-
diff --git a/proprietary/odm/etc/camera/oplus_camera_zoom_config b/proprietary/odm/etc/camera/oplus_camera_zoom_config
deleted file mode 100644
index 326adb1..0000000
--- a/proprietary/odm/etc/camera/oplus_camera_zoom_config
+++ /dev/null
@@ -1,80 +0,0 @@
-[
-
-{
-  "VendorTag": "com.oplus.sat.superphoto.zoom.ratio.range",
-  "Type": "Float",
-  "Count": "4",
-  "Value": "1.5,1.9,1.9,20.1"
-},
-
-{
-  "VendorTag": "com.oplus.sat.fusion.zoom.ratio.range",
-  "Type": "Float",
-  "Count": "2",
-  "Value": "0.69,0.99"
-},
-
-{
-  "VendorTag": "com.oplus.sat.hdr.fusion.zoom.ratio.range",
-  "Type": "Float",
-  "Count": "2",
-  "Value": "0.59,0.69"
-},
-
-{
-  "VendorTag": "com.oplus.sat.hdr.zoom.ratio.range",
-  "Type": "Float",
-  "Count": "2",
-  "Value": "0.99,1.09"
-},
-
-{
-  "VendorTag": "com.oplus.sat.normal.zoom.ratio.range",
-  "Type": "Float",
-  "Count": "4",
-  "Value": "1.1,1.4,1.9,1.9"
-},
-
-{
-  "VendorTag": "com.oplus.super.night.range.max.zoom.ratio",
-  "Type": "Float",
-  "Count": "1",
-  "Value": "-1"
-},
-
-{
-  "VendorTag": "com.oplus.sat.ultrawide.zoom.range",
-  "Type": "Float",
-  "Count": "2",
-  "Value": "0.6,1.0"
-},
-
-{
-  "VendorTag": "com.oplus.sat.main.zoom.range",
-  "Type": "Float",
-  "Count": "2",
-  "Value": "1.0,2.0"
-},
-
-{
-  "VendorTag": "com.oplus.sat.tele.zoom.range",
-  "Type": "Float",
-  "Count": "2",
-  "Value": "2.0,20.0"
-},
-
-{
-  "VendorTag": "com.oplus.sat.ainight.max.zoom.ratio",
-  "Type": "Float",
-  "Count": "1",
-  "Value": "20.0"
-},
-
-{
-  "VendorTag": "com.oplus.sat.supernight.frame.zoom.ratio",
-  "Type": "Float",
-  "Count": "1",
-  "Value": "1.41"
-}
-
-]
diff --git a/proprietary/odm/etc/camera/stereoParams_aftersale.bin b/proprietary/odm/etc/camera/stereoParams_aftersale.bin
deleted file mode 100644
index 80f3d05..0000000
Binary files a/proprietary/odm/etc/camera/stereoParams_aftersale.bin and /dev/null differ
diff --git a/proprietary/odm/etc/camera/video_beauty_default_config b/proprietary/odm/etc/camera/video_beauty_default_config
deleted file mode 100644
index 45d722e..0000000
--- a/proprietary/odm/etc/camera/video_beauty_default_config
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "isFunctionOpen":1,
-    "appConfigList": [
-        {
-         "appName":"WeChat",
-         "packageName":"com.tencent.mm",
-         "videoBeautyParam":
-            {
-                "isOpen": 0,
-                "fbParam": "30,0,0,0,0,0,0,0,30,0,0"
-            }
-        }
-    ]
-}
\ No newline at end of file
diff --git a/proprietary/system_ext/lib/libmmosal.so b/proprietary/system_ext/lib/libmmosal.so
index f255e0e..b39fd40 100644
Binary files a/proprietary/system_ext/lib/libmmosal.so and b/proprietary/system_ext/lib/libmmosal.so differ
diff --git a/proprietary/system_ext/lib/libmmparser_lite.so b/proprietary/system_ext/lib/libmmparser_lite.so
index 29c0fad..9ae9658 100644
Binary files a/proprietary/system_ext/lib/libmmparser_lite.so and b/proprietary/system_ext/lib/libmmparser_lite.so differ
diff --git a/proprietary/system_ext/lib64/libmmosal.so b/proprietary/system_ext/lib64/libmmosal.so
index a7d5ff7..8717b71 100644
Binary files a/proprietary/system_ext/lib64/libmmosal.so and b/proprietary/system_ext/lib64/libmmosal.so differ
diff --git a/proprietary/vendor/bin/cnss-daemon b/proprietary/vendor/bin/cnss-daemon
index 651e935..84ef21a 100755
Binary files a/proprietary/vendor/bin/cnss-daemon and b/proprietary/vendor/bin/cnss-daemon differ
diff --git a/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti b/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti
index fd07a1a..0cf1009 100644
Binary files a/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti and b/proprietary/vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-qti differ
diff --git a/proprietary/vendor/etc/public.libraries.txt b/proprietary/vendor/etc/public.libraries.txt
index ce929dc..fc87714 100644
--- a/proprietary/vendor/etc/public.libraries.txt
+++ b/proprietary/vendor/etc/public.libraries.txt
@@ -7,17 +7,3 @@ libsdsprpc.so
 libfastcvopt.so
 liblistensoundmodel2.so
 libOpenCL.so
-libnpu.so
-libhta_hexagon_runtime.so
-unnhal-acc-hta.so
-libAlgoProcess.so
-libancbase_rt_bokeh.so
-libAncHumBokeh.so
-libsnpe_loader.so
-libstblur_api.so
-libAncHumVideoBase.so
-libmidasserviceintf.so
-libAncFilter.so
-libarcsoft_scbokeh_video.so
-libAncHumanDoubleExposure.so
-libancbase_rt_doubleexposure.so
diff --git a/proprietary/vendor/firmware/a620_zap.b01 b/proprietary/vendor/firmware/a620_zap.b01
index 122d53d..f245db1 100644
Binary files a/proprietary/vendor/firmware/a620_zap.b01 and b/proprietary/vendor/firmware/a620_zap.b01 differ
diff --git a/proprietary/vendor/firmware/a620_zap.elf b/proprietary/vendor/firmware/a620_zap.elf
index f4906f4..57883dc 100644
Binary files a/proprietary/vendor/firmware/a620_zap.elf and b/proprietary/vendor/firmware/a620_zap.elf differ
diff --git a/proprietary/vendor/firmware/a620_zap.mdt b/proprietary/vendor/firmware/a620_zap.mdt
index cf34896..9137b64 100644
Binary files a/proprietary/vendor/firmware/a620_zap.mdt and b/proprietary/vendor/firmware/a620_zap.mdt differ
diff --git a/proprietary/vendor/firmware/ipa_fws.b01 b/proprietary/vendor/firmware/ipa_fws.b01
index d3cb492..fb109b1 100644
Binary files a/proprietary/vendor/firmware/ipa_fws.b01 and b/proprietary/vendor/firmware/ipa_fws.b01 differ
diff --git a/proprietary/vendor/firmware/ipa_fws.elf b/proprietary/vendor/firmware/ipa_fws.elf
index 98d1090..1d82d5d 100644
Binary files a/proprietary/vendor/firmware/ipa_fws.elf and b/proprietary/vendor/firmware/ipa_fws.elf differ
diff --git a/proprietary/vendor/firmware/ipa_fws.mdt b/proprietary/vendor/firmware/ipa_fws.mdt
index 425c1d3..96ed3a6 100644
Binary files a/proprietary/vendor/firmware/ipa_fws.mdt and b/proprietary/vendor/firmware/ipa_fws.mdt differ
diff --git a/proprietary/vendor/lib/hw/audio.primary.lito.so b/proprietary/vendor/lib/hw/audio.primary.lito.so
index 6fe5b88..2e73981 100644
Binary files a/proprietary/vendor/lib/hw/audio.primary.lito.so and b/proprietary/vendor/lib/hw/audio.primary.lito.so differ
diff --git a/proprietary/vendor/lib/libacdbloader.so b/proprietary/vendor/lib/libacdbloader.so
index 435c012..a0894e2 100644
Binary files a/proprietary/vendor/lib/libacdbloader.so and b/proprietary/vendor/lib/libacdbloader.so differ
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.ofilm_gc8054.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.ofilm_gc8054.bin
index 76dffe9..b6443d8 100644
Binary files a/proprietary/vendor/lib64/camera/com.qti.tuned.ofilm_gc8054.bin and b/proprietary/vendor/lib64/camera/com.qti.tuned.ofilm_gc8054.bin differ
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.qtech_hi846.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.qtech_hi846.bin
index 4c2d911..8d90731 100644
Binary files a/proprietary/vendor/lib64/camera/com.qti.tuned.qtech_hi846.bin and b/proprietary/vendor/lib64/camera/com.qti.tuned.qtech_hi846.bin differ
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.qtech_imx616.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.qtech_imx616.bin
index 6cf9bed..1cbaf03 100644
Binary files a/proprietary/vendor/lib64/camera/com.qti.tuned.qtech_imx616.bin and b/proprietary/vendor/lib64/camera/com.qti.tuned.qtech_imx616.bin differ
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.semco_imx586.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.semco_imx586.bin
index e5d5aa8..a92e95d 100644
Binary files a/proprietary/vendor/lib64/camera/com.qti.tuned.semco_imx586.bin and b/proprietary/vendor/lib64/camera/com.qti.tuned.semco_imx586.bin differ
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.shine_gc2375.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.shine_gc2375.bin
index a51d31c..53fbddc 100644
Binary files a/proprietary/vendor/lib64/camera/com.qti.tuned.shine_gc2375.bin and b/proprietary/vendor/lib64/camera/com.qti.tuned.shine_gc2375.bin differ
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.shine_gc5035.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.shine_gc5035.bin
index 86428e7..790352e 100644
Binary files a/proprietary/vendor/lib64/camera/com.qti.tuned.shine_gc5035.bin and b/proprietary/vendor/lib64/camera/com.qti.tuned.shine_gc5035.bin differ
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.shine_ov02b10.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.shine_ov02b10.bin
index 6ba86b9..ece7bb8 100644
Binary files a/proprietary/vendor/lib64/camera/com.qti.tuned.shine_ov02b10.bin and b/proprietary/vendor/lib64/camera/com.qti.tuned.shine_ov02b10.bin differ
diff --git a/proprietary/vendor/lib64/camera/com.qti.tuned.sunny_ov8856.bin b/proprietary/vendor/lib64/camera/com.qti.tuned.sunny_ov8856.bin
index f76753d..1b3782f 100644
Binary files a/proprietary/vendor/lib64/camera/com.qti.tuned.sunny_ov8856.bin and b/proprietary/vendor/lib64/camera/com.qti.tuned.sunny_ov8856.bin differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.node.eisv2.so b/proprietary/vendor/lib64/camera/components/com.qti.node.eisv2.so
index a971f7b..4c4962d 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.node.eisv2.so and b/proprietary/vendor/lib64/camera/components/com.qti.node.eisv2.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.node.eisv3.so b/proprietary/vendor/lib64/camera/components/com.qti.node.eisv3.so
index 87ea2ab..9f38325 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.node.eisv3.so and b/proprietary/vendor/lib64/camera/components/com.qti.node.eisv3.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.stats.aec.so b/proprietary/vendor/lib64/camera/components/com.qti.stats.aec.so
index aaf696c..f224c01 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.stats.aec.so and b/proprietary/vendor/lib64/camera/components/com.qti.stats.aec.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.stats.aecwrapper.so b/proprietary/vendor/lib64/camera/components/com.qti.stats.aecwrapper.so
index 4631e55..e68cb0b 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.stats.aecwrapper.so and b/proprietary/vendor/lib64/camera/components/com.qti.stats.aecwrapper.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.stats.af.so b/proprietary/vendor/lib64/camera/components/com.qti.stats.af.so
index 9ec9e34..3d86a13 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.stats.af.so and b/proprietary/vendor/lib64/camera/components/com.qti.stats.af.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.stats.afwrapper.so b/proprietary/vendor/lib64/camera/components/com.qti.stats.afwrapper.so
index 0cabac0..8180891 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.stats.afwrapper.so and b/proprietary/vendor/lib64/camera/components/com.qti.stats.afwrapper.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.stats.awbwrapper.so b/proprietary/vendor/lib64/camera/components/com.qti.stats.awbwrapper.so
index 62a26de..7e1da65 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.stats.awbwrapper.so and b/proprietary/vendor/lib64/camera/components/com.qti.stats.awbwrapper.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.stats.pdlibsony.so b/proprietary/vendor/lib64/camera/components/com.qti.stats.pdlibsony.so
index 110f8f5..0f5b460 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.stats.pdlibsony.so and b/proprietary/vendor/lib64/camera/components/com.qti.stats.pdlibsony.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qti.stats.tracker.so b/proprietary/vendor/lib64/camera/components/com.qti.stats.tracker.so
index 3e8c734..a0e8ff7 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qti.stats.tracker.so and b/proprietary/vendor/lib64/camera/components/com.qti.stats.tracker.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.aec.so b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.aec.so
index 4161395..ae82af9 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.aec.so and b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.aec.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.af.so b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.af.so
index fba3096..2e27306 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.af.so and b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.af.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.awb.so b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.awb.so
index 393ab2f..c26bbee 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.awb.so and b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.awb.so differ
diff --git a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so
index 0c8a537..fab1787 100644
Binary files a/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so and b/proprietary/vendor/lib64/camera/components/com.qtistatic.stats.pdlib.so differ
diff --git a/proprietary/vendor/lib64/hw/camera.qcom.so b/proprietary/vendor/lib64/hw/camera.qcom.so
index 077d867..d8b86e8 100644
Binary files a/proprietary/vendor/lib64/hw/camera.qcom.so and b/proprietary/vendor/lib64/hw/camera.qcom.so differ
diff --git a/proprietary/vendor/lib64/libAlgoProcess.so b/proprietary/vendor/lib64/libAlgoProcess.so
deleted file mode 100644
index a4e6e31..0000000
Binary files a/proprietary/vendor/lib64/libAlgoProcess.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libFaceBeautyLiteCap.so b/proprietary/vendor/lib64/libFaceBeautyLiteCap.so
deleted file mode 100644
index 7c0830d..0000000
Binary files a/proprietary/vendor/lib64/libFaceBeautyLiteCap.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOPPO_Front_SCPortrait.so b/proprietary/vendor/lib64/libOPPO_Front_SCPortrait.so
deleted file mode 100644
index 0877b55..0000000
Binary files a/proprietary/vendor/lib64/libOPPO_Front_SCPortrait.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libOPPO_SCPortrait.so b/proprietary/vendor/lib64/libOPPO_SCPortrait.so
deleted file mode 100644
index 0877b55..0000000
Binary files a/proprietary/vendor/lib64/libOPPO_SCPortrait.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libPlatformValidatorShared.so b/proprietary/vendor/lib64/libPlatformValidatorShared.so
deleted file mode 100644
index 19b59cb..0000000
Binary files a/proprietary/vendor/lib64/libPlatformValidatorShared.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libSNPE.so b/proprietary/vendor/lib64/libSNPE.so
deleted file mode 100644
index f8338a6..0000000
Binary files a/proprietary/vendor/lib64/libSNPE.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libSonyIMX471RmscLibrary.so b/proprietary/vendor/lib64/libSonyIMX471RmscLibrary.so
deleted file mode 100644
index ce9acf2..0000000
Binary files a/proprietary/vendor/lib64/libSonyIMX471RmscLibrary.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libSuperSensor.so b/proprietary/vendor/lib64/libSuperSensor.so
deleted file mode 100644
index d554444..0000000
Binary files a/proprietary/vendor/lib64/libSuperSensor.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libSuperSensorFallback.so b/proprietary/vendor/lib64/libSuperSensorFallback.so
deleted file mode 100644
index 44cb096..0000000
Binary files a/proprietary/vendor/lib64/libSuperSensorFallback.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libSuperSensorProcessor.so b/proprietary/vendor/lib64/libSuperSensorProcessor.so
deleted file mode 100644
index 225d459..0000000
Binary files a/proprietary/vendor/lib64/libSuperSensorProcessor.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libSuperSensorProcessorCWrapper.so b/proprietary/vendor/lib64/libSuperSensorProcessorCWrapper.so
deleted file mode 100644
index b064943..0000000
Binary files a/proprietary/vendor/lib64/libSuperSensorProcessorCWrapper.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libVDBlurless.so b/proprietary/vendor/lib64/libVDBlurless.so
deleted file mode 100644
index 77c951f..0000000
Binary files a/proprietary/vendor/lib64/libVDBlurless.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libVDDualCameraBlurlessAPI.so b/proprietary/vendor/lib64/libVDDualCameraBlurlessAPI.so
deleted file mode 100644
index 567955e..0000000
Binary files a/proprietary/vendor/lib64/libVDDualCameraBlurlessAPI.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libVDFusionBlurlessAPI_v2.so b/proprietary/vendor/lib64/libVDFusionBlurlessAPI_v2.so
deleted file mode 100644
index 173ee1b..0000000
Binary files a/proprietary/vendor/lib64/libVDFusionBlurlessAPI_v2.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libVDSuperPhotoAPI.so b/proprietary/vendor/lib64/libVDSuperPhotoAPI.so
deleted file mode 100644
index 2066661..0000000
Binary files a/proprietary/vendor/lib64/libVDSuperPhotoAPI.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/lib_oneplus_transparenteffect.so b/proprietary/vendor/lib64/lib_oneplus_transparenteffect.so
deleted file mode 100644
index 00fd722..0000000
Binary files a/proprietary/vendor/lib64/lib_oneplus_transparenteffect.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/lib_oneplus_watermark.so b/proprietary/vendor/lib64/lib_oneplus_watermark.so
deleted file mode 100644
index b47e235..0000000
Binary files a/proprietary/vendor/lib64/lib_oneplus_watermark.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libaps_frame_registration.so b/proprietary/vendor/lib64/libaps_frame_registration.so
deleted file mode 100644
index b713e48..0000000
Binary files a/proprietary/vendor/lib64/libaps_frame_registration.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libapsdarksight.so b/proprietary/vendor/lib64/libapsdarksight.so
deleted file mode 100644
index 71cef95..0000000
Binary files a/proprietary/vendor/lib64/libapsdarksight.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libapsexif.so b/proprietary/vendor/lib64/libapsexif.so
deleted file mode 100644
index fb05697..0000000
Binary files a/proprietary/vendor/lib64/libapsexif.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libapsjpeg.so b/proprietary/vendor/lib64/libapsjpeg.so
deleted file mode 100644
index 9320ca7..0000000
Binary files a/proprietary/vendor/lib64/libapsjpeg.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libc++_shared.so b/proprietary/vendor/lib64/libc++_shared.so
deleted file mode 100644
index 5b9a9cf..0000000
Binary files a/proprietary/vendor/lib64/libc++_shared.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libhexagon_nn_stub.so b/proprietary/vendor/lib64/libhexagon_nn_stub.so
index eee6668..d2c53ff 100644
Binary files a/proprietary/vendor/lib64/libhexagon_nn_stub.so and b/proprietary/vendor/lib64/libhexagon_nn_stub.so differ
diff --git a/proprietary/vendor/lib64/libhta_hexagon_runtime.so b/proprietary/vendor/lib64/libhta_hexagon_runtime.so
index 27e952e..3edfcb4 100644
Binary files a/proprietary/vendor/lib64/libhta_hexagon_runtime.so and b/proprietary/vendor/lib64/libhta_hexagon_runtime.so differ
diff --git a/proprietary/vendor/lib64/libmmosal.so b/proprietary/vendor/lib64/libmmosal.so
index e48f055..199381a 100644
Binary files a/proprietary/vendor/lib64/libmmosal.so and b/proprietary/vendor/lib64/libmmosal.so differ
diff --git a/proprietary/vendor/lib64/libmorpho_dcface.so b/proprietary/vendor/lib64/libmorpho_dcface.so
deleted file mode 100644
index 6b42e53..0000000
Binary files a/proprietary/vendor/lib64/libmorpho_dcface.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libmorpho_image_refiner_deflicker.so b/proprietary/vendor/lib64/libmorpho_image_refiner_deflicker.so
deleted file mode 100644
index 9d05f68..0000000
Binary files a/proprietary/vendor/lib64/libmorpho_image_refiner_deflicker.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libsnpe_adsp.so b/proprietary/vendor/lib64/libsnpe_adsp.so
deleted file mode 100644
index 61f1dd1..0000000
Binary files a/proprietary/vendor/lib64/libsnpe_adsp.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libsnpe_dsp_domains_v2.so b/proprietary/vendor/lib64/libsnpe_dsp_domains_v2.so
deleted file mode 100644
index 3e88d06..0000000
Binary files a/proprietary/vendor/lib64/libsnpe_dsp_domains_v2.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libstblur_capture_api.so b/proprietary/vendor/lib64/libstblur_capture_api.so
deleted file mode 100644
index 2fb8fee..0000000
Binary files a/proprietary/vendor/lib64/libstblur_capture_api.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libstdc++.so b/proprietary/vendor/lib64/libstdc++.so
deleted file mode 100644
index ce4906e..0000000
Binary files a/proprietary/vendor/lib64/libstdc++.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libsymphony-cpu.so b/proprietary/vendor/lib64/libsymphony-cpu.so
deleted file mode 100644
index 8dd26fb..0000000
Binary files a/proprietary/vendor/lib64/libsymphony-cpu.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libsymphonypower.so b/proprietary/vendor/lib64/libsymphonypower.so
deleted file mode 100644
index b6a18a3..0000000
Binary files a/proprietary/vendor/lib64/libsymphonypower.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/unnhal-acc-adreno.so b/proprietary/vendor/lib64/unnhal-acc-adreno.so
index 1834f3a..72c3d29 100644
Binary files a/proprietary/vendor/lib64/unnhal-acc-adreno.so and b/proprietary/vendor/lib64/unnhal-acc-adreno.so differ
diff --git a/proprietary/vendor/lib64/unnhal-acc-common.so b/proprietary/vendor/lib64/unnhal-acc-common.so
index 9c12446..8fb9d10 100644
Binary files a/proprietary/vendor/lib64/unnhal-acc-common.so and b/proprietary/vendor/lib64/unnhal-acc-common.so differ
diff --git a/proprietary/vendor/lib64/unnhal-acc-hta.so b/proprietary/vendor/lib64/unnhal-acc-hta.so
index 656d906..e5263ed 100644
Binary files a/proprietary/vendor/lib64/unnhal-acc-hta.so and b/proprietary/vendor/lib64/unnhal-acc-hta.so differ
diff --git a/proprietary/vendor/lib64/unnhal-acc-hvx.so b/proprietary/vendor/lib64/unnhal-acc-hvx.so
index 060b3e8..7c91099 100644
Binary files a/proprietary/vendor/lib64/unnhal-acc-hvx.so and b/proprietary/vendor/lib64/unnhal-acc-hvx.so differ
diff --git a/proprietary/vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so b/proprietary/vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so
index ba79ad5..a885728 100644
Binary files a/proprietary/vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so and b/proprietary/vendor/lib64/vendor.qti.hardware.camera.postproc@1.0-service-impl.so differ