diff --git a/a20/Android.mk b/a20/Android.mk
deleted file mode 100644
index d5cdd9b..0000000
--- a/a20/Android.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-ifneq ($(filter a20, $(TARGET_DEVICE)),)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/a20/configs/android.hardware.keymaster@4.0-service.samsung.xml b/a20/configs/android.hardware.keymaster@4.0-service.samsung.xml
deleted file mode 100644
index 6664462..0000000
--- a/a20/configs/android.hardware.keymaster@4.0-service.samsung.xml
+++ /dev/null
@@ -1,11 +0,0 @@
- <manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.keymaster</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IKeymasterDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>
diff --git a/a20/device.mk b/a20/device.mk
index 5cddcf9..196227a 100644
--- a/a20/device.mk
+++ b/a20/device.mk
@@ -5,25 +5,9 @@ $(call inherit-product, device/samsung/universal7885-common/universal7885-common
 
 $(call inherit-product, vendor/samsung/a20/a20-vendor.mk)
 
-# Keymaster
-PRODUCT_PACKAGES += \
-    android.hardware.keymaster@4.0-service.samsung \
-    libkeymaster4_1support.vendor
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/android.hardware.keymaster@4.0-service.samsung.xml:$(TARGET_COPY_OUT_VENDOR)/etc/vintf/manifest/android.hardware.keymaster@4.0-service.samsung.xml
-
 # Image
 #TARGET_PREBUILT_KERNEL := device/samsung/a20e/Image
 #PRODUCT_COPY_FILES += \
 	$(TARGET_PREBUILT_KERNEL):kernel
 
-# NFC
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/libnfc-sec-vendor.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-sec-vendor.conf
 
-# Rootdir
-PRODUCT_PACKAGES += \
-	fstab.exynos7884B \
-	init.target.rc \
-	init.baseband.rc
diff --git a/a20/extract-files.sh b/a20/extract-files.sh
deleted file mode 100755
index 0b1c089..0000000
--- a/a20/extract-files.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2019 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# If we're being sourced by the common script that we called,
-# stop right here. No need to go down the rabbit hole.
-if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
-    return
-fi
-set -e
-
-export DEVICE=a20
-export DEVICE_COMMON=universal7885-common
-export VENDOR=samsung
-
-export DEVICE_BRINGUP_YEAR=2020
-
-"./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@"
diff --git a/a20/full_a20.mk b/a20/full_a20.mk
index 9a11ef8..ef9fce5 100644
--- a/a20/full_a20.mk
+++ b/a20/full_a20.mk
@@ -16,11 +16,3 @@ PRODUCT_NAME := full_a20
 PRODUCT_MODEL := SM-A205F
 PRODUCT_BRAND := samsung
 PRODUCT_MANUFACTURER := samsung
-
-PRODUCT_GMS_CLIENTID_BASE := android-samsung
-
-# Set BUILD_FINGERPRINT variable to be picked up by both system and vendor build.prop
-BUILD_FINGERPRINT := "google/redfin/redfin:11/RQ3A.210805.001.A1/7474174:user/release-keys"
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
-        PRIVATE_BUILD_DESC="redfin-user 11 RQ3A.210805.001.A1 7474174 release-keys"
diff --git a/a20/overlay/frameworks/base/core/res/res/values/config.xml b/a20/overlay/frameworks/base/core/res/res/values/config.xml
index 2e82fe8..694c9a6 100644
--- a/a20/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a20/overlay/frameworks/base/core/res/res/values/config.xml
@@ -40,6 +40,12 @@
     <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">@*android:string/config_mainBuiltInDisplayCutout</string>
     <!-- If supported, are dreams enabled? (by default) -->
     <bool name="config_dreamsEnabledByDefault">false</bool>
+    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
+    <bool name="config_displayBlanksAfterDoze">false</bool>
+    <bool name="config_dozePulsePickup">true</bool>
+    <bool name="config_supportDoubleTapWake">true</bool>
+    <bool name="config_enableBurnInProtection">true</bool>
+    <bool name="config_allowAutoBrightnessWhileDozing">true</bool>
 
     <!-- List of biometric sensors on the device, in decreasing strength. Consumed by AuthService
          when registering authenticators with BiometricService. Format must be ID:Modality:Strength,
diff --git a/a20/rootdir/Android.mk b/a20/rootdir/Android.mk
deleted file mode 100644
index 220a064..0000000
--- a/a20/rootdir/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE       := fstab.exynos7884B
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/$(LOCAL_MODULE)
-LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)
-include $(BUILD_PREBUILT) 
-
-include $(CLEAR_VARS)
-LOCAL_MODULE       := init.target.rc
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/$(LOCAL_MODULE)
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init
-include $(BUILD_PREBUILT) 
-
-include $(CLEAR_VARS)
-LOCAL_MODULE       := init.baseband.rc
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/$(LOCAL_MODULE)
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init
-include $(BUILD_PREBUILT) 
diff --git a/a20/rootdir/etc/fstab.exynos7884B b/a20/rootdir/etc/fstab.exynos7884B
deleted file mode 100644
index f7b5ad9..0000000
--- a/a20/rootdir/etc/fstab.exynos7884B
+++ /dev/null
@@ -1,16 +0,0 @@
-# Android fstab file.
-#<src>                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-
-# system and vendor partition will be early-mounted by kernel
-# /dev/block/platform/13500000.dwmmc0/by-name/system	/system		ext4	ro	wait
-/dev/block/platform/13500000.dwmmc0/by-name/cache	/cache	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	wait,check
-/dev/block/platform/13500000.dwmmc0/by-name/userdata	/data	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	wait,check,encryptable=footer,quota,reservedsize=128M,length=-20480
-/dev/block/platform/13500000.dwmmc0/by-name/efs	/mnt/vendor/efs	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	wait,check
-/dev/block/platform/13500000.dwmmc0/by-name/misc	/misc	emmc      defaults  defaults
-
-# VOLD :: fstab.a20e
-/dev/block/platform/13500000.dwmmc0/by-name/hidden	/preload	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	voldmanaged=preload:auto,check
-/devices/platform/13550000.dwmmc2/mmc_host/mmc1*        auto        vfat    defaults    voldmanaged=sdcard:auto
-/devices/platform/13600000.usb/13600000.dwc3*		auto        auto    defaults    voldmanaged=usb:auto
diff --git a/a20/rootdir/etc/init.baseband.rc b/a20/rootdir/etc/init.baseband.rc
deleted file mode 100644
index 228eab4..0000000
--- a/a20/rootdir/etc/init.baseband.rc
+++ /dev/null
@@ -1,91 +0,0 @@
-on early-init
-    mkdir /mnt/vendor/cpefs 0771 radio system
-
-on init
-    symlink /dev/block/platform/13500000.dwmmc0/by-name/radio /dev/mbin0
-    restorecon /dev/mbin0
-
-    write /proc/sys/net/core/netdev_max_backlog 5000
-
-    write /sys/class/net/rmnet0/queues/rx-0/rps_cpus 6
-    write /sys/class/net/rmnet1/queues/rx-0/rps_cpus 6
-    write /sys/class/net/rmnet2/queues/rx-0/rps_cpus 6
-    write /sys/class/net/rmnet3/queues/rx-0/rps_cpus 6
-    write /sys/class/net/rmnet4/queues/rx-0/rps_cpus 6
-    write /sys/class/net/rmnet5/queues/rx-0/rps_cpus 6
-    write /sys/class/net/rmnet6/queues/rx-0/rps_cpus 6
-    write /sys/class/net/rmnet7/queues/rx-0/rps_cpus 6
-
-on fs && property:ro.boot.cpefs_wp=0
-    wait /dev/block/platform/13500000.dwmmc0/by-name/cpefs
-    mount ext4 /dev/block/platform/13500000.dwmmc0/by-name/cpefs /mnt/vendor/cpefs nosuid nodev noatime noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic
-    mount none /mnt/vendor/cpefs /cpefs bind
-    restorecon_recursive /mnt/vendor/cpefs
-    chown radio system /mnt/vendor/cpefs
-    chmod 0771 /mnt/vendor/cpefs
-
-on fs && property:ro.boot.cpefs_wp=1
-    wait /dev/block/platform/13500000.dwmmc0/by-name/cpefs
-    mount ext4 /dev/block/platform/13500000.dwmmc0/by-name/cpefs /mnt/vendor/cpefs ro nosuid nodev noatime noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic
-    mount none /mnt/vendor/cpefs /cpefs bind
-    restorecon_recursive /mnt/vendor/cpefs
-    chown radio system /mnt/vendor/cpefs
-    chmod 0771 /mnt/vendor/cpefs
-
-on post-fs-data
-    chown radio radio sys/devices/virtual/misc/multipdp/waketime
-    chmod 0660 /sys/devices/virtual/misc/umts_dm0/dm_state
-    chown radio system /sys/devices/virtual/misc/umts_dm0/dm_state
-
-    # /efs/factory.prop for Dual / Single SIM settings
-    chown radio radio /mnt/vendor/efs/factory.prop
-    chmod 0600 /mnt/vendor/efs/factory.prop
-
-# Modem boot daemon
-service cpboot-daemon /vendor/bin/cbd -d -tss310 -bm -mm -P platform/13500000.dwmmc0/by-name/radio
-    class main
-    user root
-    group radio cache inet misc audio sdcard_rw log sdcard_r shell system
-    seclabel u:r:cbd:s0
-
-on property:ril.clatd.v4-rmnet0=up
-    write /sys/class/net/rmnet0/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet0/queues/rx-0/rps_cpus 2
-
-on property:ril.clatd.v4-rmnet1=up
-    write /sys/class/net/rmnet1/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet1/queues/rx-0/rps_cpus 2
-
-on property:ril.clatd.v4-rmnet2=up
-    write /sys/class/net/rmnet2/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet2/queues/rx-0/rps_cpus 2
-
-on property:ril.clatd.v4-rmnet3=up
-    write /sys/class/net/rmnet3/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet3/queues/rx-0/rps_cpus 2
-
-on property:ril.clatd.v4-rmnet4=up
-    write /sys/class/net/rmnet4/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet4/queues/rx-0/rps_cpus 2
-
-on property:ril.clatd.v4-rmnet5=up
-    write /sys/class/net/rmnet5/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet5/queues/rx-0/rps_cpus 2
-
-on property:ril.clatd.v4-rmnet6=up
-    write /sys/class/net/rmnet6/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet6/queues/rx-0/rps_cpus 2
-
-on property:ril.clatd.v4-rmnet7=up
-    write /sys/class/net/rmnet7/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet7/queues/rx-0/rps_cpus 2
-
-# SS/DS configuration
-on property:ro.vendor.multisim.simslotcount=*
-   write /sys/module/modem_ctrl_ss310ap/parameters/ds_detect ${ro.vendor.multisim.simslotcount}
-
-on property:ro.vendor.multisim.simslotcount=1
-    setprop persist.radio.multisim.config ss
-
-on property:ro.vendor.multisim.simslotcount=2
-    setprop persist.radio.multisim.config dsds
diff --git a/a20/rootdir/etc/init.logcat.rc b/a20/rootdir/etc/init.logcat.rc
deleted file mode 100644
index 7a2bf15..0000000
--- a/a20/rootdir/etc/init.logcat.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-service bootlogd /system/bin/logcat -b all -f /cache/boot.log
-  user root
-  group root
-  oneshot
-  disabled
-  
-on early-init 
-  rm /cache/boot.log
-  start bootlogd
-  
-on property:sys.boot_completed=1
-  stop bootlogd
diff --git a/a20/rootdir/etc/init.target.rc b/a20/rootdir/etc/init.target.rc
deleted file mode 100644
index 86c62a9..0000000
--- a/a20/rootdir/etc/init.target.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-on init
-    # Reactivation Lock
-    symlink /dev/block/platform/13500000.dwmmc0/by-name/steady /dev/block/steady
-
-    # Google FRP solution
-    symlink /dev/block/platform/13500000.dwmmc0/by-name/persistent /dev/block/persistent
- 
-on boot
-    # Permissions for NAD
-    symlink /dev/block/platform/13500000.dwmmc0/by-name/nad_refer /dev/block/NAD_REFER
diff --git a/a20/setup-makefiles.sh b/a20/setup-makefiles.sh
deleted file mode 100755
index 0c8b627..0000000
--- a/a20/setup-makefiles.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2019 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-set -e
-
-# Required!
-export DEVICE=a20e
-export DEVICE_COMMON=universal7885-common
-export VENDOR=samsung
-
-export DEVICE_BRINGUP_YEAR=2020
-
-"./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"
diff --git a/a20/setup.sh b/a20/setup.sh
index fd9473e..aae9788 100755
--- a/a20/setup.sh
+++ b/a20/setup.sh
@@ -1,5 +1,7 @@
 VENDOR=$(cat device/samsung/universal7885-common/vendor_name)
-
+if [ ! VENDOR ]; then
+exit 1;
+fi
 # Generate AndroidProducts.mk
 echo "# Auto-Generated by device/samsung/a20/setup.sh" > device/samsung/a20/AndroidProducts.mk
 echo "PRODUCT_MAKEFILES += \$(LOCAL_DIR)/"$VENDOR"_a20.mk" >>  device/samsung/a20/AndroidProducts.mk
diff --git a/a20e/Android.mk b/a20e/Android.mk
deleted file mode 100644
index c38d2ab..0000000
--- a/a20e/Android.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-ifneq ($(filter a20e, $(TARGET_DEVICE)),)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif
diff --git a/a20e/configs/android.hardware.keymaster@4.0-service.samsung.xml b/a20e/configs/android.hardware.keymaster@4.0-service.samsung.xml
deleted file mode 100644
index 6664462..0000000
--- a/a20e/configs/android.hardware.keymaster@4.0-service.samsung.xml
+++ /dev/null
@@ -1,11 +0,0 @@
- <manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.keymaster</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IKeymasterDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>
diff --git a/a20e/configs/libnfc-sec-vendor.conf b/a20e/configs/libnfc-sec-vendor.conf
deleted file mode 100644
index 94d6a56..0000000
--- a/a20e/configs/libnfc-sec-vendor.conf
+++ /dev/null
@@ -1,123 +0,0 @@
-## --------------- Part-I : Configuration for Phone HW ----------------------------##
-####################################################################################
-# I-1) Clock Source Information (AP direct 26MHz)
-####################################################################################
-## Clock option for 26MHz PLL (0x12)
-## Clock option for 19.2MHz PLL (0x11)
-FW_CFG_CLK_SPEED=0x12
-####################################################################################
-
-
-## --------------- Part-II : Configuration for Chip / FW -------------------------##
-####################################################################################
-# II-1) FW base address : 
-####################################################################################
-## FW Base Address for SEN82 (0x2000)
-FW_BASE_ADDRESS=0x2000
-####################################################################################
-# II-2) Timing parameter 
-####################################################################################
-# WAKEUP_DELAY for eSE Model
-# (Old F/W) 		 20ms : UICC, 80ms : eSE
-# (After Star Model) 20ms : UICC, 20ms : eSE
-#WAKEUP_DELAY=20
-####################################################################################
-# II-3) Firmware path
-####################################################################################
-## F/W image for S3NRN82
-#FW_IMAGE="/vendor/firmware/nfc/sec_s3nrn82_firmware.bin"
-
-# for single SKU
-FW_DIR_PATH="/vendor/firmware/nfc/"
-FW_FILE_NAME="sec_s3nrn82_firmware.bin"
-
-####################################################################################
-# II-4) RF Register path
-####################################################################################
-## RF Register for S3NRN82
-#RFREG_FILE="/vendor/etc/nfc/sec_s3nrn82_rfreg.bin"
-
-RF_DIR_PATH="/vendor/etc/nfc/"
-RF_FILE_NAME="sec_s3nrn82_rfreg.bin"
-## --------------- Part-III : Configuration for MW --------------------------------##
-####################################################################################
-# III-1) Driver path 
-####################################################################################
-## Power driver
-POWER_DRIVER="/dev/sec-nfc"
-## Transport driver
-TRANS_DRIVER="/dev/sec-nfc"
-
-
-####################################################################################
-# III-2) Trace Level 
-####################################################################################
-## TRACE_LEVEL  (0: only err, 1: and debug, 2: trace also)
-## DATA TRACE level (0: not display, 1: simply, 2: all of data trace)
-TRACE_LEVEL=2
-DATA_TRACE=2
-
-####################################################################################
-# III-3) NFC Sleep Timing
-####################################################################################
-# Set wait time to enter CLF sleep mode
-SLEEP_TIMEOUT=1000
-
-
-####################################################################################
-# III-4) F/W Update Option
-# F/W Update Option
-# 0 : Download for different version
-# 1 : Download for upper version
-# 2 : Force Download
-####################################################################################
-# 0 : Default value is "Download for different version"
-FW_UPDATE_MODE=0
-####################################################################################
-
-
-
-
-###############################################################################
-# Configure the default NfcA/IsoDep techology and protocol route. Can be
-# either a secure element (e.g. 0x02) or the host (0x00)
-DEFAULT_ROUTE=0x03
-###############################################################################
-# Configure the single default SE to use.  The default is to use the first
-# SE that is detected by the stack.  This value might be used when the phone
-# supports multiple SE but you want to force it to use one of them
-DEFAULT_OFFHOST_ROUTE=0x02
-
-###############################################################################
-# Choose the presence-check algorithm for type-4 tag.  If not defined, the default value is 1.
-# PRESENCE_CHECK_ALGORITHM=0    : [default] Automatic select for below 4 method.
-# PRESENCE_CHECK_ALGORITHM=1    : Read Empty I block.
-# PRESENCE_CHECK_ALGORITHM=2    : Sleep/Wakeup Command
-# PRESENCE_CHECK_ALGORITHM=3    : Read binary for CH0(K version method)
-# PRESENCE_CHECK_ALGORITHM=4    : Read binary for CH3
-# PRESENCE_CHECK_ALGORITHM=5    : ACK/NACK
-# Default : No use (AUTO)
-# For China Region : Use Method 3
-###############################################################################
-PRESENCE_CHECK_ALGORITHM=5
-
-###############################################################################
-# Vendor Specific Proprietary Protocol & Discovery Configuration
-# Set to 0xFF if unsupported
-#  byte[0] NCI_PROTOCOL_18092_ACTIVE
-#  byte[1] NCI_PROTOCOL_B_PRIME
-#  byte[2] NCI_PROTOCOL_DUAL
-#  byte[3] NCI_PROTOCOL_15693
-#  byte[4] NCI_PROTOCOL_KOVIO
-#  byte[5] NCI_PROTOCOL_MIFARE
-#  byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO
-#  byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME
-#  byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME
-NFA_PROPRIETARY_CFG={00, 81, 82, 80, 8A, 81, 70, 74, F4}
-###############################################################################
-# Extended APDU length for ISO_DEP. If not supported default length is 261 
-# CHECK in VTS Test case
-# ISO_DEP_MAX_TRANSCEIVE=0xFEFF
-ISO_DEP_MAX_TRANSCEIVE=261
-
-############### end of config ##############################
diff --git a/a20e/device.mk b/a20e/device.mk
index f13d53f..9a06233 100644
--- a/a20e/device.mk
+++ b/a20e/device.mk
@@ -5,25 +5,8 @@ $(call inherit-product, device/samsung/universal7885-common/universal7885-common
 
 $(call inherit-product, vendor/samsung/a20e/a20e-vendor.mk)
 
-# Keymaster
-PRODUCT_PACKAGES += \
-    android.hardware.keymaster@4.0-service.samsung \
-    libkeymaster4_1support.vendor
-
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/android.hardware.keymaster@4.0-service.samsung.xml:$(TARGET_COPY_OUT_VENDOR)/etc/vintf/manifest/android.hardware.keymaster@4.0-service.samsung.xml
-
 # Image
 #TARGET_PREBUILT_KERNEL := device/samsung/a20e/Image
 #PRODUCT_COPY_FILES += \
 	$(TARGET_PREBUILT_KERNEL):kernel
 
-# NFC
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/libnfc-sec-vendor.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-sec-vendor.conf
-
-# Rootdir
-PRODUCT_PACKAGES += \
-	fstab.exynos7884B \
-	init.target.rc \
-	init.baseband.rc
diff --git a/a20e/extract-files.sh b/a20e/extract-files.sh
deleted file mode 100755
index 18caaa1..0000000
--- a/a20e/extract-files.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2019 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# If we're being sourced by the common script that we called,
-# stop right here. No need to go down the rabbit hole.
-if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
-    return
-fi
-set -e
-
-export DEVICE=a20e
-export DEVICE_COMMON=universal7885-common
-export VENDOR=samsung
-
-export DEVICE_BRINGUP_YEAR=2020
-
-"./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@"
diff --git a/a20e/full_a20e.mk b/a20e/full_a20e.mk
index 5c38957..7286ff1 100644
--- a/a20e/full_a20e.mk
+++ b/a20e/full_a20e.mk
@@ -17,11 +17,3 @@ PRODUCT_MODEL := SM-A202K
 PRODUCT_BRAND := samsung
 PRODUCT_MANUFACTURER := samsung
 
-PRODUCT_GMS_CLIENTID_BASE := android-samsung
-
-# Set BUILD_FINGERPRINT variable to be picked up by both system and vendor build.prop
-BUILD_FINGERPRINT := "google/redfin/redfin:11/RQ3A.210805.001.A1/7474174:user/release-keys"
-
-PRODUCT_BUILD_PROP_OVERRIDES += \
-        PRODUCT_NAME=a20ektt \
-        PRIVATE_BUILD_DESC="redfin-user 11 RQ3A.210805.001.A1 7474174 release-keys"
diff --git a/a20e/overlay/frameworks/base/core/res/res/values/config.xml b/a20e/overlay/frameworks/base/core/res/res/values/config.xml
index 7904a14..8daa2f5 100644
--- a/a20e/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a20e/overlay/frameworks/base/core/res/res/values/config.xml
@@ -7,591 +7,4 @@
     <bool name="config_supportDoubleTapWake">false</bool>
     <bool name="config_enableBurnInProtection">false</bool>
     <bool name="config_allowAutoBrightnessWhileDozing">true</bool>
-    <bool name="config_automatic_brightness_available">true</bool>
-    <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
-    <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
-    <integer-array name="config_autoBrightnessDisplayValuesNits">
-        <item>10</item>
-        <item>11</item>
-        <item>15</item>
-        <item>17</item>
-        <item>19</item>
-        <item>25</item>
-        <item>30</item>
-        <item>34</item>
-        <item>38</item>
-        <item>44</item>
-        <item>49</item>
-        <item>67</item>
-        <item>82</item>
-        <item>90</item>
-        <item>102</item>
-        <item>108</item>
-        <item>148</item>
-        <item>183</item>
-        <item>247</item>
-        <item>304</item>
-        <item>350</item>
-        <item>391</item>
-        <item>420</item>
-        <item>420</item>
-        <item>450</item>
-        <item>500</item>
-        <item>550</item>
-        <item>575</item>
-        <item>600</item>
-    </integer-array>
-    <integer-array name="config_autoBrightnessLcdBacklightValues">
-        <item>10</item>
-        <item>80</item>
-        <item>162</item>
-        <item>190</item>
-        <item>255</item>
-    </integer-array>
-    <integer-array name="config_autoBrightnessLevels">
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-        <item>15</item>
-        <item>20</item>
-        <item>25</item>
-        <item>50</item>
-        <item>100</item>
-        <item>300</item>
-        <item>500</item>
-        <item>1000</item>
-        <item>1500</item>
-        <item>2000</item>
-        <item>3000</item>
-        <item>4000</item>
-        <item>4999</item>
-        <item>5000</item>
-        <item>10000</item>
-        <item>20000</item>
-        <item>30000</item>
-        <item>40000</item>
-    </integer-array>
-    <integer-array name="config_screenBrightnessBacklight">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-        <item>11</item>
-        <item>12</item>
-        <item>13</item>
-        <item>14</item>
-        <item>15</item>
-        <item>16</item>
-        <item>17</item>
-        <item>18</item>
-        <item>19</item>
-        <item>20</item>
-        <item>21</item>
-        <item>22</item>
-        <item>23</item>
-        <item>24</item>
-        <item>25</item>
-        <item>26</item>
-        <item>27</item>
-        <item>28</item>
-        <item>29</item>
-        <item>30</item>
-        <item>31</item>
-        <item>32</item>
-        <item>33</item>
-        <item>34</item>
-        <item>35</item>
-        <item>36</item>
-        <item>37</item>
-        <item>38</item>
-        <item>39</item>
-        <item>40</item>
-        <item>41</item>
-        <item>42</item>
-        <item>43</item>
-        <item>44</item>
-        <item>45</item>
-        <item>46</item>
-        <item>47</item>
-        <item>48</item>
-        <item>49</item>
-        <item>50</item>
-        <item>51</item>
-        <item>52</item>
-        <item>53</item>
-        <item>54</item>
-        <item>55</item>
-        <item>56</item>
-        <item>57</item>
-        <item>58</item>
-        <item>59</item>
-        <item>60</item>
-        <item>61</item>
-        <item>62</item>
-        <item>63</item>
-        <item>64</item>
-        <item>65</item>
-        <item>66</item>
-        <item>67</item>
-        <item>68</item>
-        <item>69</item>
-        <item>70</item>
-        <item>71</item>
-        <item>72</item>
-        <item>73</item>
-        <item>74</item>
-        <item>75</item>
-        <item>76</item>
-        <item>77</item>
-        <item>78</item>
-        <item>79</item>
-        <item>80</item>
-        <item>81</item>
-        <item>82</item>
-        <item>83</item>
-        <item>84</item>
-        <item>85</item>
-        <item>86</item>
-        <item>87</item>
-        <item>88</item>
-        <item>89</item>
-        <item>90</item>
-        <item>91</item>
-        <item>92</item>
-        <item>93</item>
-        <item>94</item>
-        <item>95</item>
-        <item>96</item>
-        <item>97</item>
-        <item>98</item>
-        <item>99</item>
-        <item>100</item>
-        <item>101</item>
-        <item>102</item>
-        <item>103</item>
-        <item>104</item>
-        <item>105</item>
-        <item>106</item>
-        <item>107</item>
-        <item>108</item>
-        <item>109</item>
-        <item>110</item>
-        <item>111</item>
-        <item>112</item>
-        <item>113</item>
-        <item>114</item>
-        <item>115</item>
-        <item>116</item>
-        <item>117</item>
-        <item>118</item>
-        <item>119</item>
-        <item>120</item>
-        <item>121</item>
-        <item>122</item>
-        <item>123</item>
-        <item>124</item>
-        <item>125</item>
-        <item>126</item>
-        <item>127</item>
-        <item>128</item>
-        <item>129</item>
-        <item>130</item>
-        <item>131</item>
-        <item>132</item>
-        <item>133</item>
-        <item>134</item>
-        <item>135</item>
-        <item>136</item>
-        <item>137</item>
-        <item>138</item>
-        <item>139</item>
-        <item>140</item>
-        <item>141</item>
-        <item>142</item>
-        <item>143</item>
-        <item>144</item>
-        <item>145</item>
-        <item>146</item>
-        <item>147</item>
-        <item>148</item>
-        <item>149</item>
-        <item>150</item>
-        <item>151</item>
-        <item>152</item>
-        <item>153</item>
-        <item>154</item>
-        <item>155</item>
-        <item>156</item>
-        <item>157</item>
-        <item>158</item>
-        <item>159</item>
-        <item>160</item>
-        <item>161</item>
-        <item>162</item>
-        <item>163</item>
-        <item>164</item>
-        <item>165</item>
-        <item>166</item>
-        <item>167</item>
-        <item>168</item>
-        <item>169</item>
-        <item>170</item>
-        <item>171</item>
-        <item>172</item>
-        <item>173</item>
-        <item>174</item>
-        <item>175</item>
-        <item>176</item>
-        <item>177</item>
-        <item>178</item>
-        <item>179</item>
-        <item>180</item>
-        <item>181</item>
-        <item>182</item>
-        <item>183</item>
-        <item>184</item>
-        <item>185</item>
-        <item>186</item>
-        <item>187</item>
-        <item>188</item>
-        <item>189</item>
-        <item>190</item>
-        <item>191</item>
-        <item>192</item>
-        <item>193</item>
-        <item>194</item>
-        <item>195</item>
-        <item>196</item>
-        <item>197</item>
-        <item>198</item>
-        <item>199</item>
-        <item>200</item>
-        <item>201</item>
-        <item>202</item>
-        <item>203</item>
-        <item>204</item>
-        <item>205</item>
-        <item>206</item>
-        <item>207</item>
-        <item>208</item>
-        <item>209</item>
-        <item>210</item>
-        <item>211</item>
-        <item>212</item>
-        <item>213</item>
-        <item>214</item>
-        <item>215</item>
-        <item>216</item>
-        <item>217</item>
-        <item>218</item>
-        <item>219</item>
-        <item>220</item>
-        <item>221</item>
-        <item>222</item>
-        <item>223</item>
-        <item>224</item>
-        <item>225</item>
-        <item>226</item>
-        <item>227</item>
-        <item>228</item>
-        <item>229</item>
-        <item>230</item>
-        <item>231</item>
-        <item>232</item>
-        <item>233</item>
-        <item>234</item>
-        <item>235</item>
-        <item>236</item>
-        <item>237</item>
-        <item>238</item>
-        <item>239</item>
-        <item>240</item>
-        <item>241</item>
-        <item>242</item>
-        <item>243</item>
-        <item>244</item>
-        <item>245</item>
-        <item>246</item>
-        <item>247</item>
-        <item>248</item>
-        <item>249</item>
-        <item>250</item>
-        <item>251</item>
-        <item>252</item>
-        <item>253</item>
-        <item>254</item>
-        <item>255</item>
-    </integer-array>
-    <integer-array name="config_screenBrightnessNits">
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-        <item>12</item>
-        <item>13</item>
-        <item>14</item>
-        <item>15</item>
-        <item>16</item>
-        <item>18</item>
-        <item>19</item>
-        <item>20</item>
-        <item>22</item>
-        <item>24</item>
-        <item>25</item>
-        <item>26</item>
-        <item>28</item>
-        <item>29</item>
-        <item>31</item>
-        <item>32</item>
-        <item>34</item>
-        <item>35</item>
-        <item>36</item>
-        <item>38</item>
-        <item>39</item>
-        <item>41</item>
-        <item>42</item>
-        <item>44</item>
-        <item>45</item>
-        <item>46</item>
-        <item>48</item>
-        <item>49</item>
-        <item>51</item>
-        <item>52</item>
-        <item>54</item>
-        <item>55</item>
-        <item>57</item>
-        <item>58</item>
-        <item>60</item>
-        <item>61</item>
-        <item>62</item>
-        <item>64</item>
-        <item>65</item>
-        <item>67</item>
-        <item>68</item>
-        <item>70</item>
-        <item>71</item>
-        <item>72</item>
-        <item>74</item>
-        <item>75</item>
-        <item>77</item>
-        <item>78</item>
-        <item>80</item>
-        <item>81</item>
-        <item>83</item>
-        <item>84</item>
-        <item>86</item>
-        <item>87</item>
-        <item>88</item>
-        <item>90</item>
-        <item>91</item>
-        <item>93</item>
-        <item>94</item>
-        <item>95</item>
-        <item>97</item>
-        <item>98</item>
-        <item>100</item>
-        <item>101</item>
-        <item>103</item>
-        <item>104</item>
-        <item>105</item>
-        <item>107</item>
-        <item>109</item>
-        <item>110</item>
-        <item>111</item>
-        <item>113</item>
-        <item>114</item>
-        <item>116</item>
-        <item>117</item>
-        <item>119</item>
-        <item>120</item>
-        <item>121</item>
-        <item>123</item>
-        <item>124</item>
-        <item>126</item>
-        <item>127</item>
-        <item>129</item>
-        <item>130</item>
-        <item>131</item>
-        <item>133</item>
-        <item>135</item>
-        <item>136</item>
-        <item>137</item>
-        <item>139</item>
-        <item>140</item>
-        <item>142</item>
-        <item>143</item>
-        <item>145</item>
-        <item>146</item>
-        <item>147</item>
-        <item>149</item>
-        <item>150</item>
-        <item>152</item>
-        <item>153</item>
-        <item>155</item>
-        <item>156</item>
-        <item>157</item>
-        <item>159</item>
-        <item>161</item>
-        <item>162</item>
-        <item>163</item>
-        <item>165</item>
-        <item>166</item>
-        <item>168</item>
-        <item>169</item>
-        <item>171</item>
-        <item>172</item>
-        <item>173</item>
-        <item>175</item>
-        <item>176</item>
-        <item>178</item>
-        <item>179</item>
-        <item>181</item>
-        <item>182</item>
-        <item>183</item>
-        <item>186</item>
-        <item>188</item>
-        <item>189</item>
-        <item>191</item>
-        <item>193</item>
-        <item>195</item>
-        <item>197</item>
-        <item>198</item>
-        <item>201</item>
-        <item>202</item>
-        <item>204</item>
-        <item>206</item>
-        <item>208</item>
-        <item>210</item>
-        <item>212</item>
-        <item>214</item>
-        <item>216</item>
-        <item>217</item>
-        <item>219</item>
-        <item>221</item>
-        <item>223</item>
-        <item>225</item>
-        <item>226</item>
-        <item>229</item>
-        <item>230</item>
-        <item>232</item>
-        <item>234</item>
-        <item>236</item>
-        <item>238</item>
-        <item>240</item>
-        <item>242</item>
-        <item>244</item>
-        <item>245</item>
-        <item>247</item>
-        <item>249</item>
-        <item>251</item>
-        <item>253</item>
-        <item>254</item>
-        <item>257</item>
-        <item>258</item>
-        <item>260</item>
-        <item>262</item>
-        <item>264</item>
-        <item>266</item>
-        <item>268</item>
-        <item>270</item>
-        <item>272</item>
-        <item>273</item>
-        <item>275</item>
-        <item>277</item>
-        <item>279</item>
-        <item>281</item>
-        <item>282</item>
-        <item>285</item>
-        <item>286</item>
-        <item>288</item>
-        <item>290</item>
-        <item>292</item>
-        <item>294</item>
-        <item>296</item>
-        <item>298</item>
-        <item>300</item>
-        <item>301</item>
-        <item>303</item>
-        <item>305</item>
-        <item>307</item>
-        <item>309</item>
-        <item>310</item>
-        <item>313</item>
-        <item>314</item>
-        <item>316</item>
-        <item>318</item>
-        <item>320</item>
-        <item>322</item>
-        <item>324</item>
-        <item>326</item>
-        <item>327</item>
-        <item>329</item>
-        <item>331</item>
-        <item>333</item>
-        <item>335</item>
-        <item>337</item>
-        <item>338</item>
-        <item>341</item>
-        <item>342</item>
-        <item>344</item>
-        <item>346</item>
-        <item>348</item>
-        <item>350</item>
-        <item>352</item>
-        <item>354</item>
-        <item>355</item>
-        <item>357</item>
-        <item>359</item>
-        <item>361</item>
-        <item>363</item>
-        <item>365</item>
-        <item>366</item>
-        <item>369</item>
-        <item>370</item>
-        <item>372</item>
-        <item>374</item>
-        <item>376</item>
-        <item>378</item>
-        <item>379</item>
-        <item>382</item>
-        <item>383</item>
-        <item>385</item>
-        <item>387</item>
-        <item>389</item>
-        <item>391</item>
-        <item>393</item>
-        <item>395</item>
-        <item>397</item>
-        <item>398</item>
-        <item>400</item>
-        <item>402</item>
-        <item>404</item>
-        <item>406</item>
-        <item>407</item>
-        <item>410</item>
-        <item>411</item>
-        <item>413</item>
-        <item>415</item>
-        <item>417</item>
-        <item>419</item>
-        <item>420</item>
-    </integer-array>
 </resources>
diff --git a/a20e/recovery/recovery.fstab b/a20e/recovery/recovery.fstab
deleted file mode 100644
index 3ae8d8f..0000000
--- a/a20e/recovery/recovery.fstab
+++ /dev/null
@@ -1,12 +0,0 @@
-/dev/block/platform/13500000.dwmmc0/by-name/system	/system		ext4	ro,errors=panic		wait,recoveryonly
-/dev/block/platform/13500000.dwmmc0/by-name/vendor	/vendor		ext4	ro,errors=panic		wait,recoveryonly
-/dev/block/platform/13500000.dwmmc0/by-name/cache	/cache	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	wait,check
-/dev/block/platform/13500000.dwmmc0/by-name/userdata	/data	f2fs	noatime,nosuid,nodev,discard,usrquota,grpquota,fsync_mode=nobarrier,reserve_root=32768,resgid=5678	wait,check,forceencrypt=footer,quota,reservedsize=128m,length=-20480
-/dev/block/platform/13500000.dwmmc0/by-name/boot        /boot              emmc    defaults                                                                                defaults
-/dev/block/platform/13500000.dwmmc0/by-name/recovery    /recovery          emmc    defaults                                                                                defaults
-/dev/block/platform/13500000.dwmmc0/by-name/efs	/mnt/vendor/efs	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	wait,check
-/dev/block/platform/13500000.dwmmc0/by-name/cpefs	/mnt/vendor/cpefs	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	wait,check,nofail
-/dev/block/platform/13500000.dwmmc0/by-name/misc	/misc	emmc      defaults  defaults
-/dev/block/platform/13500000.dwmmc0/by-name/hidden	/preload	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	voldmanaged=preload:auto,check
-/devices/platform/13550000.dwmmc2/mmc_host/mmc1*        auto        vfat    defaults    voldmanaged=sdcard:auto
-/devices/platform/13600000.usb/13600000.dwc3*		auto        auto    defaults    voldmanaged=usb:auto
diff --git a/a20e/rootdir/Android.mk b/a20e/rootdir/Android.mk
deleted file mode 100644
index 220a064..0000000
--- a/a20e/rootdir/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE       := fstab.exynos7884B
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/$(LOCAL_MODULE)
-LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_ETC)
-include $(BUILD_PREBUILT) 
-
-include $(CLEAR_VARS)
-LOCAL_MODULE       := init.target.rc
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/$(LOCAL_MODULE)
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init
-include $(BUILD_PREBUILT) 
-
-include $(CLEAR_VARS)
-LOCAL_MODULE       := init.baseband.rc
-LOCAL_MODULE_TAGS  := optional
-LOCAL_MODULE_CLASS := ETC
-LOCAL_SRC_FILES    := etc/$(LOCAL_MODULE)
-LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC)/init
-include $(BUILD_PREBUILT) 
diff --git a/a20e/rootdir/etc/fstab.exynos7884B b/a20e/rootdir/etc/fstab.exynos7884B
deleted file mode 100644
index f7b5ad9..0000000
--- a/a20e/rootdir/etc/fstab.exynos7884B
+++ /dev/null
@@ -1,16 +0,0 @@
-# Android fstab file.
-#<src>                  <mnt_point>         <type>    <mnt_flags and options>                               <fs_mgr_flags>
-# The filesystem that contains the filesystem checker binary (typically /system) cannot
-# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-
-# system and vendor partition will be early-mounted by kernel
-# /dev/block/platform/13500000.dwmmc0/by-name/system	/system		ext4	ro	wait
-/dev/block/platform/13500000.dwmmc0/by-name/cache	/cache	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	wait,check
-/dev/block/platform/13500000.dwmmc0/by-name/userdata	/data	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	wait,check,encryptable=footer,quota,reservedsize=128M,length=-20480
-/dev/block/platform/13500000.dwmmc0/by-name/efs	/mnt/vendor/efs	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	wait,check
-/dev/block/platform/13500000.dwmmc0/by-name/misc	/misc	emmc      defaults  defaults
-
-# VOLD :: fstab.a20e
-/dev/block/platform/13500000.dwmmc0/by-name/hidden	/preload	ext4	noatime,nosuid,nodev,noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic	voldmanaged=preload:auto,check
-/devices/platform/13550000.dwmmc2/mmc_host/mmc1*        auto        vfat    defaults    voldmanaged=sdcard:auto
-/devices/platform/13600000.usb/13600000.dwc3*		auto        auto    defaults    voldmanaged=usb:auto
diff --git a/a20e/rootdir/etc/init.baseband.rc b/a20e/rootdir/etc/init.baseband.rc
deleted file mode 100644
index 228eab4..0000000
--- a/a20e/rootdir/etc/init.baseband.rc
+++ /dev/null
@@ -1,91 +0,0 @@
-on early-init
-    mkdir /mnt/vendor/cpefs 0771 radio system
-
-on init
-    symlink /dev/block/platform/13500000.dwmmc0/by-name/radio /dev/mbin0
-    restorecon /dev/mbin0
-
-    write /proc/sys/net/core/netdev_max_backlog 5000
-
-    write /sys/class/net/rmnet0/queues/rx-0/rps_cpus 6
-    write /sys/class/net/rmnet1/queues/rx-0/rps_cpus 6
-    write /sys/class/net/rmnet2/queues/rx-0/rps_cpus 6
-    write /sys/class/net/rmnet3/queues/rx-0/rps_cpus 6
-    write /sys/class/net/rmnet4/queues/rx-0/rps_cpus 6
-    write /sys/class/net/rmnet5/queues/rx-0/rps_cpus 6
-    write /sys/class/net/rmnet6/queues/rx-0/rps_cpus 6
-    write /sys/class/net/rmnet7/queues/rx-0/rps_cpus 6
-
-on fs && property:ro.boot.cpefs_wp=0
-    wait /dev/block/platform/13500000.dwmmc0/by-name/cpefs
-    mount ext4 /dev/block/platform/13500000.dwmmc0/by-name/cpefs /mnt/vendor/cpefs nosuid nodev noatime noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic
-    mount none /mnt/vendor/cpefs /cpefs bind
-    restorecon_recursive /mnt/vendor/cpefs
-    chown radio system /mnt/vendor/cpefs
-    chmod 0771 /mnt/vendor/cpefs
-
-on fs && property:ro.boot.cpefs_wp=1
-    wait /dev/block/platform/13500000.dwmmc0/by-name/cpefs
-    mount ext4 /dev/block/platform/13500000.dwmmc0/by-name/cpefs /mnt/vendor/cpefs ro nosuid nodev noatime noauto_da_alloc,discard,journal_checksum,data=ordered,errors=panic
-    mount none /mnt/vendor/cpefs /cpefs bind
-    restorecon_recursive /mnt/vendor/cpefs
-    chown radio system /mnt/vendor/cpefs
-    chmod 0771 /mnt/vendor/cpefs
-
-on post-fs-data
-    chown radio radio sys/devices/virtual/misc/multipdp/waketime
-    chmod 0660 /sys/devices/virtual/misc/umts_dm0/dm_state
-    chown radio system /sys/devices/virtual/misc/umts_dm0/dm_state
-
-    # /efs/factory.prop for Dual / Single SIM settings
-    chown radio radio /mnt/vendor/efs/factory.prop
-    chmod 0600 /mnt/vendor/efs/factory.prop
-
-# Modem boot daemon
-service cpboot-daemon /vendor/bin/cbd -d -tss310 -bm -mm -P platform/13500000.dwmmc0/by-name/radio
-    class main
-    user root
-    group radio cache inet misc audio sdcard_rw log sdcard_r shell system
-    seclabel u:r:cbd:s0
-
-on property:ril.clatd.v4-rmnet0=up
-    write /sys/class/net/rmnet0/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet0/queues/rx-0/rps_cpus 2
-
-on property:ril.clatd.v4-rmnet1=up
-    write /sys/class/net/rmnet1/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet1/queues/rx-0/rps_cpus 2
-
-on property:ril.clatd.v4-rmnet2=up
-    write /sys/class/net/rmnet2/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet2/queues/rx-0/rps_cpus 2
-
-on property:ril.clatd.v4-rmnet3=up
-    write /sys/class/net/rmnet3/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet3/queues/rx-0/rps_cpus 2
-
-on property:ril.clatd.v4-rmnet4=up
-    write /sys/class/net/rmnet4/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet4/queues/rx-0/rps_cpus 2
-
-on property:ril.clatd.v4-rmnet5=up
-    write /sys/class/net/rmnet5/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet5/queues/rx-0/rps_cpus 2
-
-on property:ril.clatd.v4-rmnet6=up
-    write /sys/class/net/rmnet6/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet6/queues/rx-0/rps_cpus 2
-
-on property:ril.clatd.v4-rmnet7=up
-    write /sys/class/net/rmnet7/queues/rx-0/rps_cpus 4
-    write /sys/class/net/v4-rmnet7/queues/rx-0/rps_cpus 2
-
-# SS/DS configuration
-on property:ro.vendor.multisim.simslotcount=*
-   write /sys/module/modem_ctrl_ss310ap/parameters/ds_detect ${ro.vendor.multisim.simslotcount}
-
-on property:ro.vendor.multisim.simslotcount=1
-    setprop persist.radio.multisim.config ss
-
-on property:ro.vendor.multisim.simslotcount=2
-    setprop persist.radio.multisim.config dsds
diff --git a/a20e/rootdir/etc/init.logcat.rc b/a20e/rootdir/etc/init.logcat.rc
deleted file mode 100644
index 7a2bf15..0000000
--- a/a20e/rootdir/etc/init.logcat.rc
+++ /dev/null
@@ -1,12 +0,0 @@
-service bootlogd /system/bin/logcat -b all -f /cache/boot.log
-  user root
-  group root
-  oneshot
-  disabled
-  
-on early-init 
-  rm /cache/boot.log
-  start bootlogd
-  
-on property:sys.boot_completed=1
-  stop bootlogd
diff --git a/a20e/rootdir/etc/init.target.rc b/a20e/rootdir/etc/init.target.rc
deleted file mode 100644
index 86c62a9..0000000
--- a/a20e/rootdir/etc/init.target.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-on init
-    # Reactivation Lock
-    symlink /dev/block/platform/13500000.dwmmc0/by-name/steady /dev/block/steady
-
-    # Google FRP solution
-    symlink /dev/block/platform/13500000.dwmmc0/by-name/persistent /dev/block/persistent
- 
-on boot
-    # Permissions for NAD
-    symlink /dev/block/platform/13500000.dwmmc0/by-name/nad_refer /dev/block/NAD_REFER
diff --git a/a20e/setup-makefiles.sh b/a20e/setup-makefiles.sh
deleted file mode 100755
index 0c8b627..0000000
--- a/a20e/setup-makefiles.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2019 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-set -e
-
-# Required!
-export DEVICE=a20e
-export DEVICE_COMMON=universal7885-common
-export VENDOR=samsung
-
-export DEVICE_BRINGUP_YEAR=2020
-
-"./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"
diff --git a/a20e/setup.sh b/a20e/setup.sh
index a81ddb9..a0ad52a 100755
--- a/a20e/setup.sh
+++ b/a20e/setup.sh
@@ -1,4 +1,7 @@
 VENDOR=$(cat device/samsung/universal7885-common/vendor_name)
+if [ ! VENDOR ]; then
+exit 1;
+fi
 
 # Generate AndroidProducts.mk
 echo "# Auto-Generated by device/samsung/a20e/setup.sh" > device/samsung/a20e/AndroidProducts.mk
diff --git a/universal7885-common/apps/CameraLightSensor/Android.bp b/universal7885-common/apps/CameraLightSensor/Android.bp
deleted file mode 100644
index fc3d95b..0000000
--- a/universal7885-common/apps/CameraLightSensor/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-android_app {
-    name: "CameraLightSensor",
-    srcs: [
-        "src/**/*.java",
-    ],
-    platform_apis: true,
-    privileged: true,
-    certificate: "platform",
-}
diff --git a/universal7885-common/apps/CameraLightSensor/AndroidManifest.xml b/universal7885-common/apps/CameraLightSensor/AndroidManifest.xml
deleted file mode 100644
index b11f68a..0000000
--- a/universal7885-common/apps/CameraLightSensor/AndroidManifest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.eurekateam.cameralightsensor">
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
-    <uses-permission android:name="android.permission.CAMERA" />
-
-    <uses-feature android:name="android.hardware.camera" />
-    <protected-broadcast android:name="com.android.systemui.doze.pulse" />
-    <application
-        android:allowBackup="true"
-        android:label="@string/app_name">
-        <receiver
-            android:name=".BootReceiver"
-            android:defaultToDeviceProtectedStorage="true"
-            android:directBootAware="true"
-            android:enabled="true"
-            android:exported="true">
-            <intent-filter android:priority="1000">
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-        </receiver>
-        <service
-            android:name=".CameraLightSensorService"
-            android:exported="true">
-        </service>
-        <service
-            android:name=".CameraListener"
-            android:exported="true">
-        </service>
-    </application>
-</manifest>
\ No newline at end of file
diff --git a/universal7885-common/apps/CameraLightSensor/java/com/eurekateam/cameralightsensor/BootReceiver.java b/universal7885-common/apps/CameraLightSensor/java/com/eurekateam/cameralightsensor/BootReceiver.java
deleted file mode 100644
index f5eb17c..0000000
--- a/universal7885-common/apps/CameraLightSensor/java/com/eurekateam/cameralightsensor/BootReceiver.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.eurekateam.cameralightsensor;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-public class BootReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        final Intent i = new Intent(context, CameraLightSensorService.class);
-        context.startService(i);
-    }
-}
diff --git a/universal7885-common/apps/CameraLightSensor/java/com/eurekateam/cameralightsensor/CameraLightSensorService.java b/universal7885-common/apps/CameraLightSensor/java/com/eurekateam/cameralightsensor/CameraLightSensorService.java
deleted file mode 100644
index 13ebacd..0000000
--- a/universal7885-common/apps/CameraLightSensor/java/com/eurekateam/cameralightsensor/CameraLightSensorService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.eurekateam.cameralightsensor;
-
-import android.app.Service;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.IBinder;
-import android.provider.Settings;
-import android.util.Log;
-
-public class CameraLightSensorService extends Service {
-    private static final String TAG = "CameraLightSensor";
-    private static final boolean DEBUG = false;
-    final Intent i = new Intent(getApplicationContext(), CameraListener.class);
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        IntentFilter screenStateFilter = new IntentFilter(Intent.ACTION_SCREEN_ON);
-        screenStateFilter.addAction(Intent.ACTION_SCREEN_OFF);
-        registerReceiver(mScreenStateReceiver, screenStateFilter);
-    }
-
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        if (DEBUG) Log.d(TAG, "Starting service");
-        return START_STICKY;
-    }
-    @Override
-    public void onDestroy() {
-        if (DEBUG) Log.d(TAG, "Destroying service");
-        super.onDestroy();
-        this.unregisterReceiver(mScreenStateReceiver);
-    }
-    private final BroadcastReceiver mScreenStateReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent.getAction().equals(Intent.ACTION_SCREEN_ON)) {
-                try {
-                    onDisplayOn();
-                } catch (Settings.SettingNotFoundException e) {
-                    e.printStackTrace();
-                }
-            } else if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) {
-                onDisplayOff();
-            }
-        }
-    };
-    private void onDisplayOn() throws Settings.SettingNotFoundException {
-        if(Settings.System.getInt(getContentResolver(),
-                Settings.System.SCREEN_BRIGHTNESS_MODE ) == 1){
-            Log.d(TAG, "AutoBrightness Mode Enabled. Starting...");
-            getApplicationContext().startService(i);
-        }else{
-            Log.d(TAG, "AutoBrightness Mode Disabled, Not Starting Service...");
-        }
-    }
-    private void onDisplayOff(){
-        Log.d(TAG, "Screen is off. Stopping Service...");
-        getApplicationContext().stopService(i);
-    }
-}
diff --git a/universal7885-common/apps/CameraLightSensor/java/com/eurekateam/cameralightsensor/CameraListener.java b/universal7885-common/apps/CameraLightSensor/java/com/eurekateam/cameralightsensor/CameraListener.java
deleted file mode 100644
index 7af1ac0..0000000
--- a/universal7885-common/apps/CameraLightSensor/java/com/eurekateam/cameralightsensor/CameraListener.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.eurekateam.cameralightsensor;
-
-import android.app.Service;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Color;
-import android.graphics.ImageFormat;
-import android.graphics.Rect;
-import android.graphics.YuvImage;
-import android.hardware.Camera;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Looper;
-import android.provider.Settings;
-import android.util.Log;
-
-import java.io.ByteArrayOutputStream;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
-public class CameraListener extends Service {
-
-    private final String TAG = CameraListener.class.getSimpleName();
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        return START_STICKY;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        Handler mHandler = new Handler(Looper.getMainLooper());
-        AtomicInteger prev = new AtomicInteger(Settings.System.getInt(getContentResolver(), Settings.System.SCREEN_BRIGHTNESS, 50));
-        mHandler.postDelayed(() -> {
-            int current = calculateBrightnessEstimate(getPreviewBitmap());
-            Log.i(TAG, ": Current Brigtness: " + current);
-            if(prev.get() > current) {
-                while (prev.get() - current > 0) {
-                    Settings.System.putInt(getContentResolver(), Settings.System.SCREEN_BRIGHTNESS, current);
-                    current += 2;
-                }
-            }else{
-                while (prev.get() - current < 0) {
-                    Settings.System.putInt(getContentResolver(), Settings.System.SCREEN_BRIGHTNESS, current);
-                    current -= 2;
-                }
-            }
-            prev.set(current);
-        },1000);
-    }
-
-    private int findFrontFacingCamera() {
-        return 2;
-    }
-
-    private Bitmap getPreviewBitmap() {
-        AtomicReference<Bitmap> bitmap = null;
-        Camera mCamera = Camera.open(findFrontFacingCamera());
-        mCamera.setPreviewCallback((data, camera) -> {
-                    if (camera != null) {
-                        Camera.Parameters parameters = camera.getParameters();
-                        int imageFormat = parameters.getPreviewFormat();
-                        if (imageFormat == ImageFormat.NV21) {
-                            int w = parameters.getPreviewSize().width;
-                            int h = parameters.getPreviewSize().height;
-
-                            YuvImage yuvImage = new YuvImage(data, imageFormat, w, h, null);
-                            Rect rect = new Rect(0, 0, w, h);
-                            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                            yuvImage.compressToJpeg(rect, 100, outputStream);
-
-                            bitmap.set(BitmapFactory.decodeByteArray(outputStream.toByteArray(), 0, outputStream.size()));
-                        } else if (imageFormat == ImageFormat.JPEG || imageFormat == ImageFormat.RGB_565) {
-                            bitmap.set(BitmapFactory.decodeByteArray(data, 0, data.length));
-                        }
-                    }
-                }
-        );
-        mCamera.stopPreview();
-        mCamera.release();
-        return bitmap.get();
-    }
-    private int calculateBrightnessEstimate(Bitmap bitmap) {
-        int R = 0; int G = 0; int B = 0;
-        int height = bitmap.getHeight();
-        int width = bitmap.getWidth();
-        int n = 0;
-        int[] pixels = new int[width * height];
-        bitmap.getPixels(pixels, 0, width, 0, 0, width, height);
-        for (int i = 0; i < pixels.length; i += 5) {
-            int color = pixels[i];
-            R += Color.red(color);
-            G += Color.green(color);
-            B += Color.blue(color);
-            n++;
-        }
-        return (R + B + G) / (n * 3);
-    }
-}
diff --git a/universal7885-common/apps/CameraLightSensor/res/drawable-v24/ic_launcher_foreground.xml b/universal7885-common/apps/CameraLightSensor/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d1..0000000
--- a/universal7885-common/apps/CameraLightSensor/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
diff --git a/universal7885-common/apps/CameraLightSensor/res/drawable/ic_launcher_background.xml b/universal7885-common/apps/CameraLightSensor/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/universal7885-common/apps/CameraLightSensor/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/universal7885-common/apps/CameraLightSensor/res/mipmap-anydpi-v26/ic_launcher.xml b/universal7885-common/apps/CameraLightSensor/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index eca70cf..0000000
--- a/universal7885-common/apps/CameraLightSensor/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/universal7885-common/apps/CameraLightSensor/res/mipmap-anydpi-v26/ic_launcher_round.xml b/universal7885-common/apps/CameraLightSensor/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index eca70cf..0000000
--- a/universal7885-common/apps/CameraLightSensor/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/universal7885-common/apps/CameraLightSensor/res/mipmap-hdpi/ic_launcher.webp b/universal7885-common/apps/CameraLightSensor/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
Binary files a/universal7885-common/apps/CameraLightSensor/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/universal7885-common/apps/CameraLightSensor/res/mipmap-hdpi/ic_launcher_round.webp b/universal7885-common/apps/CameraLightSensor/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
Binary files a/universal7885-common/apps/CameraLightSensor/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/universal7885-common/apps/CameraLightSensor/res/mipmap-mdpi/ic_launcher.webp b/universal7885-common/apps/CameraLightSensor/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
Binary files a/universal7885-common/apps/CameraLightSensor/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/universal7885-common/apps/CameraLightSensor/res/mipmap-mdpi/ic_launcher_round.webp b/universal7885-common/apps/CameraLightSensor/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
Binary files a/universal7885-common/apps/CameraLightSensor/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/universal7885-common/apps/CameraLightSensor/res/mipmap-xhdpi/ic_launcher.webp b/universal7885-common/apps/CameraLightSensor/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
Binary files a/universal7885-common/apps/CameraLightSensor/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/universal7885-common/apps/CameraLightSensor/res/mipmap-xhdpi/ic_launcher_round.webp b/universal7885-common/apps/CameraLightSensor/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
Binary files a/universal7885-common/apps/CameraLightSensor/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/universal7885-common/apps/CameraLightSensor/res/mipmap-xxhdpi/ic_launcher.webp b/universal7885-common/apps/CameraLightSensor/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
Binary files a/universal7885-common/apps/CameraLightSensor/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/universal7885-common/apps/CameraLightSensor/res/mipmap-xxhdpi/ic_launcher_round.webp b/universal7885-common/apps/CameraLightSensor/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
Binary files a/universal7885-common/apps/CameraLightSensor/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/universal7885-common/apps/CameraLightSensor/res/mipmap-xxxhdpi/ic_launcher.webp b/universal7885-common/apps/CameraLightSensor/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d642..0000000
Binary files a/universal7885-common/apps/CameraLightSensor/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/universal7885-common/apps/CameraLightSensor/res/mipmap-xxxhdpi/ic_launcher_round.webp b/universal7885-common/apps/CameraLightSensor/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae3..0000000
Binary files a/universal7885-common/apps/CameraLightSensor/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/universal7885-common/apps/CameraLightSensor/res/values-night/themes.xml b/universal7885-common/apps/CameraLightSensor/res/values-night/themes.xml
deleted file mode 100644
index 2fc2bce..0000000
--- a/universal7885-common/apps/CameraLightSensor/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.CameraLightSensor" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
\ No newline at end of file
diff --git a/universal7885-common/apps/CameraLightSensor/res/values/colors.xml b/universal7885-common/apps/CameraLightSensor/res/values/colors.xml
deleted file mode 100644
index f8c6127..0000000
--- a/universal7885-common/apps/CameraLightSensor/res/values/colors.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/universal7885-common/apps/CameraLightSensor/res/values/strings.xml b/universal7885-common/apps/CameraLightSensor/res/values/strings.xml
deleted file mode 100644
index a2a4d20..0000000
--- a/universal7885-common/apps/CameraLightSensor/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">CameraLightSensor</string>
-</resources>
\ No newline at end of file
diff --git a/universal7885-common/apps/CameraLightSensor/res/values/themes.xml b/universal7885-common/apps/CameraLightSensor/res/values/themes.xml
deleted file mode 100644
index a27548d..0000000
--- a/universal7885-common/apps/CameraLightSensor/res/values/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.CameraLightSensor" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
\ No newline at end of file
diff --git a/a20/configs/libnfc-sec-vendor.conf b/universal7885-common/configs/libnfc-sec-vendor.conf
similarity index 100%
rename from a20/configs/libnfc-sec-vendor.conf
rename to universal7885-common/configs/libnfc-sec-vendor.conf
diff --git a/universal7885-common/manifest.xml b/universal7885-common/manifest.xml
index 6c79967..b005aba 100644
--- a/universal7885-common/manifest.xml
+++ b/universal7885-common/manifest.xml
@@ -115,6 +115,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.keymaster</name>
+        <transport>hwbinder</transport>
+        <version>4.0</version>
+        <interface>
+            <name>IKeymasterDevice</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.light</name>
         <transport>hwbinder</transport>
diff --git a/a20/recovery/recovery.fstab b/universal7885-common/recovery/recovery.fstab
similarity index 100%
rename from a20/recovery/recovery.fstab
rename to universal7885-common/recovery/recovery.fstab
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 044e31e..a3129e7 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -65,7 +65,7 @@ PRODUCT_PACKAGES += \
     android.hardware.drm@1.2.vendor \
     android.hardware.drm@1.3.vendor
 
-# Figerprint
+# Fingerprint
 PRODUCT_PACKAGES += \
     android.hardware.biometrics.fingerprint@2.1-service.samsung
 
@@ -93,6 +93,7 @@ PRODUCT_PACKAGES += \
 # GcamGO 
 PRODUCT_PACKAGES += \
     GCamGo
+    
 # Health
 PRODUCT_PACKAGES += \
     android.hardware.health@2.1-impl \
@@ -113,8 +114,19 @@ PRODUCT_PACKAGES += \
     init.exynos7884B.rc \
     init.exynos7884B.usb.rc \
     ueventd.exynos7884B.rc \
-    wifi_sec.rc
+    wifi_sec.rc \
+    fstab.exynos7884B \
+    init.target.rc \
+    init.baseband.rc
+   
+# Keymaster
+PRODUCT_PACKAGES += \
+    android.hardware.keymaster@4.0-service.samsung \
+    libkeymaster4_1support.vendor
 
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/android.hardware.keymaster@4.0-service.samsung.xml:$(TARGET_COPY_OUT_VENDOR)/etc/vintf/manifest/android.hardware.keymaster@4.0-service.samsung.xml
+    
 # Light
 PRODUCT_PACKAGES += \
     android.hardware.light@2.0-service.samsung
@@ -139,6 +151,9 @@ PRODUCT_PACKAGES += \
     NfcNci \
     Tag
 
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/libnfc-sec-vendor.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-sec-vendor.conf
+
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \
     $(LOCAL_PATH)/configs/nfcee_access.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/nfcee_access.xml