diff --git a/proprietary-files.txt b/proprietary-files.txt
deleted file mode 100644
index a1d6acf..0000000
--- a/proprietary-files.txt
+++ /dev/null
@@ -1,248 +0,0 @@
-# All blobs below are extracted from a40ser-user-11-RP1A.200720.012-A405FMPUU3CUC2-release-keys
-
-# Audio
-vendor/bin/main_abox
-vendor/etc/audio_board_info.xml
-vendor/etc/dolby/dax-default.xml
-vendor/etc/floating_feature.xml
-vendor/etc/mixer_gains.xml
-vendor/etc/mixer_paths.xml
-vendor/firmware/APBargeIn_AUDIO_SLSI.bin
-vendor/firmware/AP_AUDIO_SLSI.bin
-vendor/firmware/Tfa9896.cnt
-vendor/firmware/calliope_dram.bin
-vendor/firmware/calliope_sram.bin
-vendor/lib/hw/audio.primary.exynos7904.so
-vendor/lib/libSamsungPostProcessConvertor.so
-vendor/lib/lib_SamsungRec_07001.so
-vendor/lib/lib_SoundAlive_SRC384_ver320.so
-vendor/lib/lib_soundaliveresampler.so
-vendor/lib/libaudio_soundtrigger.so
-vendor/lib/libfloatingfeature.so
-vendor/lib/libprofileparamstorage.so
-vendor/lib/librecordalive.so
-vendor/lib/libsamsungDiamondVoice.so
-vendor/lib/libsecaudiocoreutils.so
-vendor/lib/libsecaudioinfo.so
-vendor/lib/soundfx/libaudioeffectoffload.so
-vendor/lib/soundfx/libswdap.so
-vendor/lib/vndk/libaudioroute.so
-vendor/lib/vndk/libtinyalsa.so
-vendor/lib64/libfloatingfeature.so
-vendor/lib64/libprofileparamstorage.so
-vendor/lib64/libsecaudiocoreutils.so
-vendor/lib64/libsecaudioinfo.so
-vendor/lib64/soundfx/libaudioeffectoffload.so
-vendor/lib64/soundfx/libswdap.so
-
-# Camera
-vendor/lib/camera.device@1.0-impl.so
-vendor/lib/camera.device@3.2-impl.so
-vendor/lib/camera.device@3.3-impl.so
-vendor/lib/camera.device@3.4-impl.so
-vendor/lib/camera.device@3.5-impl.so
-vendor/lib64/camera.device@1.0-impl.so
-vendor/lib64/camera.device@3.2-impl.so
-vendor/lib64/camera.device@3.3-impl.so
-vendor/lib64/camera.device@3.4-impl.so
-vendor/lib64/camera.device@3.5-impl.so
-
-# DRM
-vendor/bin/hw/android.hardware.drm@1.3-service.widevine
-vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc
-vendor/lib/liboemcrypto.so
-vendor/lib/libwvhidl.so
-vendor/lib/mediadrm/libwvdrmengine.so
-
-# Fingerprint
-vendor/lib/libegis_fp_normal_sensor_test.so
-vendor/lib/libgf_in_system_lib.so
-vendor/lib/libqfp_sensortest.so
-vendor/lib/libsynaFpSensorTestNwd.so
-vendor/lib64/libegis_fp_normal_sensor_test.so
-vendor/lib64/libgf_in_system_lib.so
-vendor/lib64/libqfp_sensortest.so
-vendor/lib64/libsynaFpSensorTestNwd.so
-
-# GPS
-vendor/bin/hw/gpsd
-vendor/bin/hw/gps.sh
-vendor/bin/hw/vendor.samsung.hardware.gnss@2.0-service
-vendor/etc/gnss/ca.pem
-vendor/etc/gnss/gps.cfg
-vendor/etc/init/init.gps.rc
-vendor/etc/init/vendor.samsung.hardware.gnss@2.0-service.rc
-vendor/lib/libwrappergps.so
-vendor/lib64/hw/android.hardware.gnss@2.1-impl.so
-vendor/lib64/hw/vendor.samsung.hardware.gnss@2.0-impl.so
-vendor/lib64/libwrappergps.so
-vendor/lib64/vendor.samsung.hardware.gnss@2.0.so
-
-# Graphics
-vendor/lib/egl/libGLES_mali.so
-vendor/lib/hw/gralloc.exynos7904.so
-vendor/lib/hw/hwcomposer.exynos7904.so
-vendor/lib/libExynosHWCService.so
-vendor/lib/libGrallocWrapper.so
-vendor/lib/libacryl.so
-vendor/lib/libexynosgraphicbuffer.so
-vendor/lib/libexynosdisplay.so
-vendor/lib/libexynosgscaler.so
-vendor/lib/libexynosscaler.so
-vendor/lib/libexynosutils.so
-vendor/lib/libexynosv4l2.so
-vendor/lib/libion_exynos.so
-vendor/lib64/egl/libGLES_mali.so
-vendor/lib64/hw/gralloc.exynos7904.so
-vendor/lib64/hw/hwcomposer.exynos7904.so
-vendor/lib64/libExynosHWCService.so
-vendor/lib64/libGrallocWrapper.so
-vendor/lib64/libexynosgraphicbuffer.so
-vendor/lib64/libacryl.so
-vendor/lib64/libexynosdisplay.so
-vendor/lib64/libexynosgscaler.so
-vendor/lib64/libexynosscaler.so
-vendor/lib64/libexynosutils.so
-vendor/lib64/libexynosv4l2.so
-vendor/lib64/libion_exynos.so
-
-# Media
-vendor/etc/media_codecs.xml
-vendor/etc/media_codecs_performance.xml
-vendor/etc/media_profiles_V1_0.xml
-vendor/firmware/mfc_fw.bin
-
-# Memtrack
-vendor/lib/hw/memtrack.exynos7904.so
-vendor/lib64/hw/memtrack.exynos7904.so
-
-# OMX
-vendor/lib/libExynosOMX_Core.so
-vendor/lib/libExynosOMX_Resourcemanager.so
-vendor/lib/libepicoperator.so
-vendor/lib/libstagefright_omx_vendor.so
-vendor/lib/libstagefright_soft_ac4dec.so
-vendor/lib/libstagefright_soft_ddpdec.so
-vendor/lib/libstagefrighthw.so
-vendor/lib/omx/libOMX.Exynos.AVC.Decoder.so
-vendor/lib/omx/libOMX.Exynos.AVC.Encoder.so
-vendor/lib/omx/libOMX.Exynos.HEVC.Decoder.so
-vendor/lib/omx/libOMX.Exynos.HEVC.Encoder.so
-vendor/lib/omx/libOMX.Exynos.MPEG4.Decoder.so
-vendor/lib/omx/libOMX.Exynos.MPEG4.Encoder.so
-vendor/lib/omx/libOMX.Exynos.VP8.Decoder.so
-vendor/lib/omx/libOMX.Exynos.VP8.Encoder.so
-vendor/lib/omx/libOMX.Exynos.VP9.Decoder.so
-vendor/lib/omx/libOMX.Exynos.WMV.Decoder.so
-vendor/lib64/libExynosOMX_Core.so
-vendor/lib64/libExynosOMX_Resourcemanager.so
-vendor/lib64/libepicoperator.so
-vendor/lib64/libstagefrighthw.so
-vendor/lib64/omx/libOMX.Exynos.AVC.Decoder.so
-vendor/lib64/omx/libOMX.Exynos.AVC.Encoder.so
-vendor/lib64/omx/libOMX.Exynos.HEVC.Decoder.so
-vendor/lib64/omx/libOMX.Exynos.HEVC.Encoder.so
-vendor/lib64/omx/libOMX.Exynos.MPEG4.Decoder.so
-vendor/lib64/omx/libOMX.Exynos.MPEG4.Encoder.so
-vendor/lib64/omx/libOMX.Exynos.VP8.Decoder.so
-vendor/lib64/omx/libOMX.Exynos.VP8.Encoder.so
-vendor/lib64/omx/libOMX.Exynos.VP9.Decoder.so
-vendor/lib64/omx/libOMX.Exynos.WMV.Decoder.so
-
-# RIL
-vendor/bin/cbd
-vendor/bin/hw/rild
-vendor/bin/secril_config_svc
-vendor/etc/init/init.vendor.onebinary.rc
-vendor/etc/init/init.vendor.rilchip.rc
-vendor/etc/init/init.vendor.rilcommon.rc
-vendor/etc/plmn_delta.bin
-vendor/etc/plmn_delta_attaio.bin
-vendor/etc/plmn_delta_hktw.bin
-vendor/etc/plmn_delta_usagsm.bin
-vendor/etc/plmn_se13.bin
-vendor/lib/libaudio-ril.so
-vendor/lib/libreference-ril.so
-vendor/lib/libril.so
-vendor/lib/librilutils.so
-vendor/lib/libsecnativefeature.so
-vendor/lib/libsemnativecarrierfeature.so
-vendor/lib/libsecril-client.so
-vendor/lib/vendor.samsung.hardware.radio.bridge@2.0.so
-vendor/lib/vendor.samsung.hardware.radio@2.0.so
-vendor/lib/vendor.samsung.hardware.radio@2.1.so
-vendor/lib64/libengmode_client.so
-vendor/lib64/libreference-ril.so
-vendor/lib64/libril.so
-vendor/lib64/librilutils.so
-vendor/lib64/libsecnativefeature.so
-vendor/lib64/libsemnativecarrierfeature.so
-vendor/lib64/libsecril-client.so
-vendor/lib64/libsec-ril-dsds.so
-vendor/lib64/libsec-ril.so
-vendor/lib64/libvkmanager_vendor.so
-vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so
-vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so
-vendor/lib64/vendor.samsung.hardware.radio@2.0.so
-vendor/lib64/vendor.samsung.hardware.radio@2.1.so
-
-# Sensors
-vendor/etc/yas_set.cfg
-vendor/lib/libyasalgo.so
-vendor/lib64/libyasalgo.so
-
-# Wifi
-vendor/bin/hw/macloader
-vendor/bin/wlbtd
-vendor/etc/init/wifi_slsi.rc
-vendor/etc/wifi/hydra_config.sdb
-vendor/etc/wifi/indoorchannel.info
-vendor/etc/wifi/mx
-vendor/etc/wifi/mx140.bin
-vendor/etc/wifi/mx140/debug/common/log-strings.bin
-vendor/etc/wifi/mx140/debug/hardware/moredump/bt_registers.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/cortexM4.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/cortexR4.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/mailbox16.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/mailbox4.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/mailbox8.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/moredump.bin
-vendor/etc/wifi/mx140/debug/hardware/moredump/moredump.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/pl192vic.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/rf_chip_registers.xml
-vendor/etc/wifi/mx140/debug/hardware/moredump/wlan_sys_registers.xml
-vendor/etc/wifi/mx140/debug/wlan/hip_signals.xml
-vendor/etc/wifi/mx140/debug/wlan/id.txt
-vendor/etc/wifi/mx140/debug/wlan/mib_out.xml
-vendor/etc/wifi/mx140/debug/wlan/symbols.dbg
-vendor/etc/wifi/mx140/debug/wlan/unicli.dbg
-vendor/etc/wifi/mx140/debug/wlan/unitab.dbg
-vendor/etc/wifi/mx140/debug/wlan/univif.dbg
-vendor/etc/wifi/mx140/debug/wlan/xide_mib.dbg
-vendor/etc/wifi/mx140_bt.hcf
-vendor/etc/wifi/mx140_t.bin
-vendor/etc/wifi/mx140_t/debug/common/log-strings.bin
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/bt_registers.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/cortexM4.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/cortexR4.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/mailbox16.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/mailbox4.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/mailbox8.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/moredump.bin
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/moredump.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/pl192vic.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/rf_chip_registers.xml
-vendor/etc/wifi/mx140_t/debug/hardware/moredump/wlan_sys_registers.xml
-vendor/etc/wifi/mx140_t/debug/wlan/hip_signals.xml
-vendor/etc/wifi/mx140_t/debug/wlan/id.txt
-vendor/etc/wifi/mx140_t/debug/wlan/mib_out.xml
-vendor/etc/wifi/mx140_t/debug/wlan/symbols.dbg
-vendor/etc/wifi/mx140_t/debug/wlan/unicli.dbg
-vendor/etc/wifi/mx140_t/debug/wlan/unitab.dbg
-vendor/etc/wifi/mx140_t/debug/wlan/univif.dbg
-vendor/etc/wifi/mx140_t/debug/wlan/xide_mib.dbg
-vendor/etc/wifi/mx140_t_wlan.hcf
-vendor/etc/wifi/mx140_t_wlan_t.hcf
-vendor/etc/wifi/mx140_wlan.hcf
-vendor/etc/wifi/mx140_wlan_t.hcf
-vendor/etc/wifi/platform.txt
diff --git a/universal7885-common/manifest.xml b/universal7885-common/manifest.xml
index 8108dae..ec2173e 100644
--- a/universal7885-common/manifest.xml
+++ b/universal7885-common/manifest.xml
@@ -7,7 +7,6 @@
IDevicesFactory
default
- @6.0::IDevicesFactory/default
android.hardware.audio.effect
@@ -17,7 +16,6 @@
IEffectsFactory
default
- @6.0::IEffectsFactory/default
android.hardware.biometrics.fingerprint
@@ -27,7 +25,6 @@
IBiometricsFingerprint
default
- @2.1::IBiometricsFingerprint/default
android.hardware.bluetooth
@@ -37,7 +34,6 @@
IBluetoothHci
default
- @1.0::IBluetoothHci/default
android.hardware.camera.provider
@@ -47,7 +43,6 @@
ICameraProvider
legacy/0
- @2.5::ICameraProvider/legacy/0
android.hardware.configstore
@@ -57,7 +52,6 @@
ISurfaceFlingerConfigs
default
- @1.1::ISurfaceFlingerConfigs/default
android.hardware.drm
@@ -82,7 +76,6 @@
IGatekeeper
default
- @1.0::IGatekeeper/default
android.hardware.gnss
@@ -103,7 +96,6 @@
IAllocator
default
- @2.0::IAllocator/default
android.hardware.graphics.composer
@@ -113,7 +105,6 @@
IComposer
default
- @2.1::IComposer/default
android.hardware.graphics.mapper
@@ -123,7 +114,6 @@
IMapper
default
- @2.0::IMapper/default
android.hardware.light
@@ -133,7 +123,6 @@
ILight
default
- @2.0::ILight/default
android.hardware.media.omx
@@ -147,8 +136,6 @@
IOmxStore
default
- @1.0::IOmx/default
- @1.0::IOmxStore/default
android.hardware.memtrack
@@ -158,7 +145,6 @@
IMemtrack
default
- @1.0::IMemtrack/default
android.hardware.power
@@ -168,13 +154,8 @@
IPower
default
- @1.0::IPower/default
-
- android.hardware.radio
- hwbinder
-
-
+
android.hardware.radio
hwbinder
@1.2::ISap/slot1
@@ -182,7 +163,7 @@
@1.4::IRadio/slot1
@1.4::IRadio/slot2
-
+
android.hardware.radio.config
hwbinder
1.1
@@ -190,11 +171,6 @@
IRadioConfig
default
- @1.1::IRadioConfig/default
-
-
- android.hardware.radio.deprecated
- hwbinder
android.hardware.renderscript
@@ -204,7 +180,6 @@
IDevice
default
- @1.0::IDevice/default
android.hardware.sensors
@@ -214,7 +189,6 @@
ISensors
default
- @1.0::ISensors/default
android.hardware.soundtrigger
@@ -224,7 +198,6 @@
ISoundTriggerHw
default
- @2.0::ISoundTriggerHw/default
android.hardware.thermal
@@ -244,7 +217,6 @@
IUsb
default
- @1.1::IUsb/default
vendor.samsung.hardware.gnss
@@ -254,11 +226,6 @@
ISehGnss
default
- @2.0::ISehGnss/default
-
-
- vendor.samsung.hardware.radio
- hwbinder
vendor.samsung.hardware.radio
@@ -269,12 +236,6 @@
slot1
slot2
- @2.1::ISehRadio/slot1
- @2.1::ISehRadio/slot2
-
-
- vendor.samsung.hardware.radio.bridge
- hwbinder
vendor.samsung.hardware.radio.bridge
@@ -285,12 +246,6 @@
slot1
slot2
- @2.0::ISehBridge/slot1
- @2.0::ISehBridge/slot2
-
-
- vendor.samsung.hardware.radio.channel
- hwbinder
vendor.samsung.hardware.radio.channel
@@ -303,10 +258,6 @@
imsd
imsd2
- @2.0::ISehChannel/epdgd
- @2.0::ISehChannel/epdgd2
- @2.0::ISehChannel/imsd
- @2.0::ISehChannel/imsd2
vendor.trustonic.tee
@@ -316,7 +267,6 @@
ITee
default
- @1.0::ITee/default
vendor.trustonic.teeregistry
@@ -326,7 +276,6 @@
ITeeRegistry
default
- @1.0::ITeeRegistry/default
vendor.lineage.power