diff --git a/out/arm/arch/addon.d/30-gapps.sh b/out/arm/arch/addon.d/30-gapps.sh
deleted file mode 100644
index b0fcadf..0000000
--- a/out/arm/arch/addon.d/30-gapps.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/sbin/sh
-#
-# /system/addon.d/70-gapps.sh
-#
-. /tmp/backuptool.functions
-
-list_files() {
-cat <<EOF
-addon.d/30-gapps.sh
-app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
-app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
-etc/permissions/com.google.android.camera2.xml
-etc/permissions/com.google.android.maps.xml
-etc/permissions/com.google.android.media.effects.xml
-etc/permissions/com.google.widevine.software.drm.xml
-etc/permissions/features.xml
-framework/com.google.camera2.jar
-framework/com.google.android.maps.jar
-framework/com.google.android.media.effects.jar
-framework/com.google.widevine.software.drm.jar
-lib/libfilterpack_facedetect.so
-lib/libgoogle_hotword_jni.so
-lib/libgoogle_recognizer_jni_l.so
-lib/libjni_latinimegoogle.so
-priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
-priv-app/GoogleFeedback/GoogleFeedback.apk
-priv-app/GoogleLoginService/GoogleLoginService.apk
-priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
-priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
-priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
-priv-app/Phonesky/Phonesky.apk
-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
-priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
-priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
-priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
-priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
-priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
-priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
-priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
-priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
-priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
-priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
-priv-app/SetupWizardSetupWizard.apk app/Provision/Provision.apk
-priv-app/Velvet/Velvet.apk app/QuickSearchBox/QuickSearchBox.apk
-priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
-priv-app/Velvet/lib/arm/libgoogle_recognizer_jni_l.so
-priv-app/Velvet/lib/arm/libvcdecoder_jni.so
-EOF
-}
-
-case "$1" in
-  backup)
-    list_files | while read FILE DUMMY; do
-      backup_file $S/$FILE
-    done
-  ;;
-  restore)
-    list_files | while read FILE REPLACEMENT; do
-      R=""
-      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
-      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
-    done
-  ;;
-  pre-backup)
-    # Stub
-  ;;
-  post-backup)
-    # Stub
-  ;;
-  pre-restore)
-    # Stub
-  ;;
-  post-restore)
-    # Stub
-  ;;
-esac
diff --git a/out/arm/arch/addon.d/31-faceunlock.sh b/out/arm/arch/addon.d/31-faceunlock.sh
deleted file mode 100644
index aa16b4f..0000000
--- a/out/arm/arch/addon.d/31-faceunlock.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/sh
-#
-# /system/addon.d/71-gapps-faceunlock.sh
-#
-
-. /tmp/backuptool.functions
-
-
-
-
-list_files() {
-cat <<EOF
-app/FaceLock/FaceLock.apk
-app/FaceLock/lib/arm/libfacelock_jni.so
-lib/libfacelock_jni.so
-vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin
-vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
-vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
-vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin
-vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin
-EOF
-}
-
-case "$1" in
-  backup)
-    list_files | while read FILE DUMMY; do
-      backup_file $S/$FILE
-    done
-  ;;
-  restore)
-    list_files | while read FILE REPLACEMENT; do
-      R=""
-      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
-      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
-    done
-  ;;
-  pre-backup)
-    # Stub
-  ;;
-  post-backup)
-    # Stub
-  ;;
-  pre-restore)
-    # Stub
-  ;;
-  post-restore)
-    # Stub
-  ;;
-esac
diff --git a/out/arm/arch/app/FaceLock/FaceLock.apk b/out/arm/arch/app/FaceLock/FaceLock.apk
deleted file mode 100644
index c747086..0000000
Binary files a/out/arm/arch/app/FaceLock/FaceLock.apk and /dev/null differ
diff --git a/out/arm/arch/app/FaceLock/lib/arm/libfacelock_jni.so b/out/arm/arch/app/FaceLock/lib/arm/libfacelock_jni.so
deleted file mode 100644
index e85ef56..0000000
Binary files a/out/arm/arch/app/FaceLock/lib/arm/libfacelock_jni.so and /dev/null differ
diff --git a/out/arm/arch/arm/addon.d/30-gapps.sh b/out/arm/arch/arm/addon.d/30-gapps.sh
deleted file mode 100644
index b0fcadf..0000000
--- a/out/arm/arch/arm/addon.d/30-gapps.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/sbin/sh
-#
-# /system/addon.d/70-gapps.sh
-#
-. /tmp/backuptool.functions
-
-list_files() {
-cat <<EOF
-addon.d/30-gapps.sh
-app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
-app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
-etc/permissions/com.google.android.camera2.xml
-etc/permissions/com.google.android.maps.xml
-etc/permissions/com.google.android.media.effects.xml
-etc/permissions/com.google.widevine.software.drm.xml
-etc/permissions/features.xml
-framework/com.google.camera2.jar
-framework/com.google.android.maps.jar
-framework/com.google.android.media.effects.jar
-framework/com.google.widevine.software.drm.jar
-lib/libfilterpack_facedetect.so
-lib/libgoogle_hotword_jni.so
-lib/libgoogle_recognizer_jni_l.so
-lib/libjni_latinimegoogle.so
-priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
-priv-app/GoogleFeedback/GoogleFeedback.apk
-priv-app/GoogleLoginService/GoogleLoginService.apk
-priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
-priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
-priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
-priv-app/Phonesky/Phonesky.apk
-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
-priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
-priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
-priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
-priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
-priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
-priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
-priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
-priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
-priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
-priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
-priv-app/SetupWizardSetupWizard.apk app/Provision/Provision.apk
-priv-app/Velvet/Velvet.apk app/QuickSearchBox/QuickSearchBox.apk
-priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
-priv-app/Velvet/lib/arm/libgoogle_recognizer_jni_l.so
-priv-app/Velvet/lib/arm/libvcdecoder_jni.so
-EOF
-}
-
-case "$1" in
-  backup)
-    list_files | while read FILE DUMMY; do
-      backup_file $S/$FILE
-    done
-  ;;
-  restore)
-    list_files | while read FILE REPLACEMENT; do
-      R=""
-      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
-      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
-    done
-  ;;
-  pre-backup)
-    # Stub
-  ;;
-  post-backup)
-    # Stub
-  ;;
-  pre-restore)
-    # Stub
-  ;;
-  post-restore)
-    # Stub
-  ;;
-esac
diff --git a/out/arm/arch/arm/addon.d/31-faceunlock.sh b/out/arm/arch/arm/addon.d/31-faceunlock.sh
deleted file mode 100644
index aa16b4f..0000000
--- a/out/arm/arch/arm/addon.d/31-faceunlock.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/sh
-#
-# /system/addon.d/71-gapps-faceunlock.sh
-#
-
-. /tmp/backuptool.functions
-
-
-
-
-list_files() {
-cat <<EOF
-app/FaceLock/FaceLock.apk
-app/FaceLock/lib/arm/libfacelock_jni.so
-lib/libfacelock_jni.so
-vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin
-vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
-vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
-vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin
-vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin
-EOF
-}
-
-case "$1" in
-  backup)
-    list_files | while read FILE DUMMY; do
-      backup_file $S/$FILE
-    done
-  ;;
-  restore)
-    list_files | while read FILE REPLACEMENT; do
-      R=""
-      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
-      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
-    done
-  ;;
-  pre-backup)
-    # Stub
-  ;;
-  post-backup)
-    # Stub
-  ;;
-  pre-restore)
-    # Stub
-  ;;
-  post-restore)
-    # Stub
-  ;;
-esac
diff --git a/out/arm/arch/arm/app/FaceLock/FaceLock.apk b/out/arm/arch/arm/app/FaceLock/FaceLock.apk
deleted file mode 100644
index c747086..0000000
Binary files a/out/arm/arch/arm/app/FaceLock/FaceLock.apk and /dev/null differ
diff --git a/out/arm/arch/arm/app/FaceLock/lib/arm/libfacelock_jni.so b/out/arm/arch/arm/app/FaceLock/lib/arm/libfacelock_jni.so
deleted file mode 100644
index e85ef56..0000000
Binary files a/out/arm/arch/arm/app/FaceLock/lib/arm/libfacelock_jni.so and /dev/null differ
diff --git a/out/arm/arch/arm/lib/libfacelock_jni.so b/out/arm/arch/arm/lib/libfacelock_jni.so
deleted file mode 100644
index e85ef56..0000000
Binary files a/out/arm/arch/arm/lib/libfacelock_jni.so and /dev/null differ
diff --git a/out/arm/arch/arm/lib/libfilterpack_facedetect.so b/out/arm/arch/arm/lib/libfilterpack_facedetect.so
deleted file mode 100644
index a48ef48..0000000
Binary files a/out/arm/arch/arm/lib/libfilterpack_facedetect.so and /dev/null differ
diff --git a/out/arm/arch/arm/lib/libgoogle_hotword_jni.so b/out/arm/arch/arm/lib/libgoogle_hotword_jni.so
deleted file mode 100644
index 77c2b56..0000000
Binary files a/out/arm/arch/arm/lib/libgoogle_hotword_jni.so and /dev/null differ
diff --git a/out/arm/arch/arm/lib/libgoogle_recognizer_jni_l.so b/out/arm/arch/arm/lib/libgoogle_recognizer_jni_l.so
deleted file mode 100644
index 7ce9f01..0000000
Binary files a/out/arm/arch/arm/lib/libgoogle_recognizer_jni_l.so and /dev/null differ
diff --git a/out/arm/arch/arm/lib/libjni_latinimegoogle.so b/out/arm/arch/arm/lib/libjni_latinimegoogle.so
deleted file mode 100644
index 33e3bef..0000000
Binary files a/out/arm/arch/arm/lib/libjni_latinimegoogle.so and /dev/null differ
diff --git a/out/arm/arch/arm/lib/libvcdecoder_jni.so b/out/arm/arch/arm/lib/libvcdecoder_jni.so
deleted file mode 100644
index dfa5e35..0000000
Binary files a/out/arm/arch/arm/lib/libvcdecoder_jni.so and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
deleted file mode 100644
index 9dadc7a..0000000
Binary files a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
deleted file mode 100644
index 712a056..0000000
Binary files a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so
deleted file mode 100644
index b0c048d..0000000
Binary files a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
deleted file mode 100644
index 12da616..0000000
Binary files a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
deleted file mode 100644
index aa890ee..0000000
Binary files a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so
deleted file mode 100644
index aff3661..0000000
Binary files a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
deleted file mode 100644
index 7d1a050..0000000
Binary files a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
deleted file mode 100644
index 3d53bf0..0000000
Binary files a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
deleted file mode 100644
index 63401b1..0000000
Binary files a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
deleted file mode 100644
index b5087e4..0000000
Binary files a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
deleted file mode 100644
index 2966172..0000000
Binary files a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
deleted file mode 100644
index 8c68b1f..0000000
Binary files a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
deleted file mode 100644
index e18424c..0000000
Binary files a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so b/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so
deleted file mode 100644
index fe32c33..0000000
Binary files a/out/arm/arch/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/Velvet/Velvet.apk b/out/arm/arch/arm/priv-app/Velvet/Velvet.apk
deleted file mode 100644
index d8e7627..0000000
Binary files a/out/arm/arch/arm/priv-app/Velvet/Velvet.apk and /dev/null differ
diff --git a/out/arm/arch/arm/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so b/out/arm/arch/arm/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
deleted file mode 120000
index 8d0a12b..0000000
--- a/out/arm/arch/arm/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
+++ /dev/null
@@ -1 +0,0 @@
-/system/lib/libgoogle_hotword_jni.so
\ No newline at end of file
diff --git a/out/arm/arch/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so b/out/arm/arch/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so
deleted file mode 120000
index 30b7122..0000000
--- a/out/arm/arch/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so
+++ /dev/null
@@ -1 +0,0 @@
-/system/lib/libgoogle_recognizer_jni_l.so
\ No newline at end of file
diff --git a/out/arm/arch/arm/priv-app/Velvet/lib/arm/libvcdecoder_jni.so b/out/arm/arch/arm/priv-app/Velvet/lib/arm/libvcdecoder_jni.so
deleted file mode 120000
index cd1fe04..0000000
--- a/out/arm/arch/arm/priv-app/Velvet/lib/arm/libvcdecoder_jni.so
+++ /dev/null
@@ -1 +0,0 @@
-/system/lib/libvcdecoder_jni.so
\ No newline at end of file
diff --git a/out/arm/arch/lib/libfacelock_jni.so b/out/arm/arch/lib/libfacelock_jni.so
deleted file mode 100644
index e85ef56..0000000
Binary files a/out/arm/arch/lib/libfacelock_jni.so and /dev/null differ
diff --git a/out/arm/arch/lib/libfilterpack_facedetect.so b/out/arm/arch/lib/libfilterpack_facedetect.so
deleted file mode 100644
index a48ef48..0000000
Binary files a/out/arm/arch/lib/libfilterpack_facedetect.so and /dev/null differ
diff --git a/out/arm/arch/lib/libgoogle_hotword_jni.so b/out/arm/arch/lib/libgoogle_hotword_jni.so
deleted file mode 100644
index 77c2b56..0000000
Binary files a/out/arm/arch/lib/libgoogle_hotword_jni.so and /dev/null differ
diff --git a/out/arm/arch/lib/libgoogle_recognizer_jni_l.so b/out/arm/arch/lib/libgoogle_recognizer_jni_l.so
deleted file mode 100644
index 7ce9f01..0000000
Binary files a/out/arm/arch/lib/libgoogle_recognizer_jni_l.so and /dev/null differ
diff --git a/out/arm/arch/lib/libjni_latinimegoogle.so b/out/arm/arch/lib/libjni_latinimegoogle.so
deleted file mode 100644
index 33e3bef..0000000
Binary files a/out/arm/arch/lib/libjni_latinimegoogle.so and /dev/null differ
diff --git a/out/arm/arch/lib/libvcdecoder_jni.so b/out/arm/arch/lib/libvcdecoder_jni.so
deleted file mode 100644
index dfa5e35..0000000
Binary files a/out/arm/arch/lib/libvcdecoder_jni.so and /dev/null differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk b/out/arm/arch/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
deleted file mode 100644
index 9dadc7a..0000000
Binary files a/out/arm/arch/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and /dev/null differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
deleted file mode 100644
index 712a056..0000000
Binary files a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so and /dev/null differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so
deleted file mode 100644
index b0c048d..0000000
Binary files a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so and /dev/null differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
deleted file mode 100644
index 12da616..0000000
Binary files a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so and /dev/null differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
deleted file mode 100644
index aa890ee..0000000
Binary files a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so and /dev/null differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so
deleted file mode 100644
index aff3661..0000000
Binary files a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so and /dev/null differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
deleted file mode 100644
index 7d1a050..0000000
Binary files a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so and /dev/null differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
deleted file mode 100644
index 3d53bf0..0000000
Binary files a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so and /dev/null differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
deleted file mode 100644
index 63401b1..0000000
Binary files a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so and /dev/null differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
deleted file mode 100644
index b5087e4..0000000
Binary files a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so and /dev/null differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
deleted file mode 100644
index 2966172..0000000
Binary files a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so and /dev/null differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
deleted file mode 100644
index 8c68b1f..0000000
Binary files a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so and /dev/null differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
deleted file mode 100644
index e18424c..0000000
Binary files a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so and /dev/null differ
diff --git a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so b/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so
deleted file mode 100644
index fe32c33..0000000
Binary files a/out/arm/arch/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so and /dev/null differ
diff --git a/out/arm/arch/priv-app/Velvet/Velvet.apk b/out/arm/arch/priv-app/Velvet/Velvet.apk
deleted file mode 100644
index d8e7627..0000000
Binary files a/out/arm/arch/priv-app/Velvet/Velvet.apk and /dev/null differ
diff --git a/out/arm/arch/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so b/out/arm/arch/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
deleted file mode 120000
index 8d0a12b..0000000
--- a/out/arm/arch/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
+++ /dev/null
@@ -1 +0,0 @@
-/system/lib/libgoogle_hotword_jni.so
\ No newline at end of file
diff --git a/out/arm/arch/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so b/out/arm/arch/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so
deleted file mode 120000
index 30b7122..0000000
--- a/out/arm/arch/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so
+++ /dev/null
@@ -1 +0,0 @@
-/system/lib/libgoogle_recognizer_jni_l.so
\ No newline at end of file
diff --git a/out/arm/arch/priv-app/Velvet/lib/arm/libvcdecoder_jni.so b/out/arm/arch/priv-app/Velvet/lib/arm/libvcdecoder_jni.so
deleted file mode 120000
index cd1fe04..0000000
--- a/out/arm/arch/priv-app/Velvet/lib/arm/libvcdecoder_jni.so
+++ /dev/null
@@ -1 +0,0 @@
-/system/lib/libvcdecoder_jni.so
\ No newline at end of file
diff --git a/out/arm/arm/addon.d/30-gapps.sh b/out/arm/arm/addon.d/30-gapps.sh
deleted file mode 100644
index b0fcadf..0000000
--- a/out/arm/arm/addon.d/30-gapps.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/sbin/sh
-#
-# /system/addon.d/70-gapps.sh
-#
-. /tmp/backuptool.functions
-
-list_files() {
-cat <<EOF
-addon.d/30-gapps.sh
-app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
-app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
-etc/permissions/com.google.android.camera2.xml
-etc/permissions/com.google.android.maps.xml
-etc/permissions/com.google.android.media.effects.xml
-etc/permissions/com.google.widevine.software.drm.xml
-etc/permissions/features.xml
-framework/com.google.camera2.jar
-framework/com.google.android.maps.jar
-framework/com.google.android.media.effects.jar
-framework/com.google.widevine.software.drm.jar
-lib/libfilterpack_facedetect.so
-lib/libgoogle_hotword_jni.so
-lib/libgoogle_recognizer_jni_l.so
-lib/libjni_latinimegoogle.so
-priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
-priv-app/GoogleFeedback/GoogleFeedback.apk
-priv-app/GoogleLoginService/GoogleLoginService.apk
-priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
-priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
-priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
-priv-app/Phonesky/Phonesky.apk
-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
-priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
-priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
-priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
-priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
-priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
-priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
-priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
-priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
-priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
-priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
-priv-app/SetupWizardSetupWizard.apk app/Provision/Provision.apk
-priv-app/Velvet/Velvet.apk app/QuickSearchBox/QuickSearchBox.apk
-priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
-priv-app/Velvet/lib/arm/libgoogle_recognizer_jni_l.so
-priv-app/Velvet/lib/arm/libvcdecoder_jni.so
-EOF
-}
-
-case "$1" in
-  backup)
-    list_files | while read FILE DUMMY; do
-      backup_file $S/$FILE
-    done
-  ;;
-  restore)
-    list_files | while read FILE REPLACEMENT; do
-      R=""
-      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
-      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
-    done
-  ;;
-  pre-backup)
-    # Stub
-  ;;
-  post-backup)
-    # Stub
-  ;;
-  pre-restore)
-    # Stub
-  ;;
-  post-restore)
-    # Stub
-  ;;
-esac
diff --git a/out/arm/arm/addon.d/31-faceunlock.sh b/out/arm/arm/addon.d/31-faceunlock.sh
deleted file mode 100644
index aa16b4f..0000000
--- a/out/arm/arm/addon.d/31-faceunlock.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/sh
-#
-# /system/addon.d/71-gapps-faceunlock.sh
-#
-
-. /tmp/backuptool.functions
-
-
-
-
-list_files() {
-cat <<EOF
-app/FaceLock/FaceLock.apk
-app/FaceLock/lib/arm/libfacelock_jni.so
-lib/libfacelock_jni.so
-vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin
-vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
-vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
-vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin
-vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin
-vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin
-EOF
-}
-
-case "$1" in
-  backup)
-    list_files | while read FILE DUMMY; do
-      backup_file $S/$FILE
-    done
-  ;;
-  restore)
-    list_files | while read FILE REPLACEMENT; do
-      R=""
-      [ -n "$REPLACEMENT" ] && R="$S/$REPLACEMENT"
-      [ -f "$C/$S/$FILE" ] && restore_file $S/$FILE $R
-    done
-  ;;
-  pre-backup)
-    # Stub
-  ;;
-  post-backup)
-    # Stub
-  ;;
-  pre-restore)
-    # Stub
-  ;;
-  post-restore)
-    # Stub
-  ;;
-esac
diff --git a/out/arm/arm/app/FaceLock/FaceLock.apk b/out/arm/arm/app/FaceLock/FaceLock.apk
deleted file mode 100644
index c747086..0000000
Binary files a/out/arm/arm/app/FaceLock/FaceLock.apk and /dev/null differ
diff --git a/out/arm/arm/app/FaceLock/lib/arm/libfacelock_jni.so b/out/arm/arm/app/FaceLock/lib/arm/libfacelock_jni.so
deleted file mode 100644
index e85ef56..0000000
Binary files a/out/arm/arm/app/FaceLock/lib/arm/libfacelock_jni.so and /dev/null differ
diff --git a/out/arm/arm/lib/libfacelock_jni.so b/out/arm/arm/lib/libfacelock_jni.so
deleted file mode 100644
index e85ef56..0000000
Binary files a/out/arm/arm/lib/libfacelock_jni.so and /dev/null differ
diff --git a/out/arm/arm/lib/libfilterpack_facedetect.so b/out/arm/arm/lib/libfilterpack_facedetect.so
deleted file mode 100644
index a48ef48..0000000
Binary files a/out/arm/arm/lib/libfilterpack_facedetect.so and /dev/null differ
diff --git a/out/arm/arm/lib/libgoogle_hotword_jni.so b/out/arm/arm/lib/libgoogle_hotword_jni.so
deleted file mode 100644
index 77c2b56..0000000
Binary files a/out/arm/arm/lib/libgoogle_hotword_jni.so and /dev/null differ
diff --git a/out/arm/arm/lib/libgoogle_recognizer_jni_l.so b/out/arm/arm/lib/libgoogle_recognizer_jni_l.so
deleted file mode 100644
index 7ce9f01..0000000
Binary files a/out/arm/arm/lib/libgoogle_recognizer_jni_l.so and /dev/null differ
diff --git a/out/arm/arm/lib/libjni_latinimegoogle.so b/out/arm/arm/lib/libjni_latinimegoogle.so
deleted file mode 100644
index 33e3bef..0000000
Binary files a/out/arm/arm/lib/libjni_latinimegoogle.so and /dev/null differ
diff --git a/out/arm/arm/lib/libvcdecoder_jni.so b/out/arm/arm/lib/libvcdecoder_jni.so
deleted file mode 100644
index dfa5e35..0000000
Binary files a/out/arm/arm/lib/libvcdecoder_jni.so and /dev/null differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk b/out/arm/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
deleted file mode 100644
index 9dadc7a..0000000
Binary files a/out/arm/arm/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and /dev/null differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so
deleted file mode 100644
index 712a056..0000000
Binary files a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libAppDataSearch.so and /dev/null differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so
deleted file mode 100644
index b0c048d..0000000
Binary files a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libNearbyApp.so and /dev/null differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so
deleted file mode 100644
index 12da616..0000000
Binary files a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libWhisper.so and /dev/null differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so
deleted file mode 100644
index aa890ee..0000000
Binary files a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libconscrypt_gmscore_jni.so and /dev/null differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so
deleted file mode 100644
index aff3661..0000000
Binary files a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libdirect-audio.so and /dev/null differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so
deleted file mode 100644
index 7d1a050..0000000
Binary files a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgames_rtmp_jni.so and /dev/null differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so
deleted file mode 100644
index 3d53bf0..0000000
Binary files a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_base.so and /dev/null differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so
deleted file mode 100644
index 63401b1..0000000
Binary files a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgcastv2_support.so and /dev/null differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so
deleted file mode 100644
index b5087e4..0000000
Binary files a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgms-ocrclient.so and /dev/null differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so
deleted file mode 100644
index 2966172..0000000
Binary files a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libgmscore.so and /dev/null differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so
deleted file mode 100644
index 8c68b1f..0000000
Binary files a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libjgcastservice.so and /dev/null differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so
deleted file mode 100644
index e18424c..0000000
Binary files a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libsslwrapper_jni.so and /dev/null differ
diff --git a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so b/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so
deleted file mode 100644
index fe32c33..0000000
Binary files a/out/arm/arm/priv-app/PrebuiltGmsCore/lib/arm/libwearable-selector.so and /dev/null differ
diff --git a/out/arm/arm/priv-app/Velvet/Velvet.apk b/out/arm/arm/priv-app/Velvet/Velvet.apk
deleted file mode 100644
index d8e7627..0000000
Binary files a/out/arm/arm/priv-app/Velvet/Velvet.apk and /dev/null differ
diff --git a/out/arm/arm/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so b/out/arm/arm/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
deleted file mode 120000
index 8d0a12b..0000000
--- a/out/arm/arm/priv-app/Velvet/lib/arm/libgoogle_hotword_jni.so
+++ /dev/null
@@ -1 +0,0 @@
-/system/lib/libgoogle_hotword_jni.so
\ No newline at end of file
diff --git a/out/arm/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so b/out/arm/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so
deleted file mode 120000
index 30b7122..0000000
--- a/out/arm/arm/priv-app/Velvet/lib/arm/libgoogle_recognizer_jni.so
+++ /dev/null
@@ -1 +0,0 @@
-/system/lib/libgoogle_recognizer_jni_l.so
\ No newline at end of file
diff --git a/out/arm/arm/priv-app/Velvet/lib/arm/libvcdecoder_jni.so b/out/arm/arm/priv-app/Velvet/lib/arm/libvcdecoder_jni.so
deleted file mode 120000
index cd1fe04..0000000
--- a/out/arm/arm/priv-app/Velvet/lib/arm/libvcdecoder_jni.so
+++ /dev/null
@@ -1 +0,0 @@
-/system/lib/libvcdecoder_jni.so
\ No newline at end of file
diff --git a/out/arm/common/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk b/out/arm/common/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk
deleted file mode 100644
index 0c4d7b9..0000000
Binary files a/out/arm/common/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk and /dev/null differ
diff --git a/out/arm/common/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk b/out/arm/common/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
deleted file mode 100644
index 551fe59..0000000
Binary files a/out/arm/common/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk and /dev/null differ
diff --git a/out/arm/common/etc/permissions/com.google.android.camera2.xml b/out/arm/common/etc/permissions/com.google.android.camera2.xml
deleted file mode 100644
index 97d5a2f..0000000
--- a/out/arm/common/etc/permissions/com.google.android.camera2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source 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.
--->
-
-<permissions>
-    <library name="com.google.android.camera2"
-            file="/system/framework/com.google.android.camera2.jar" />
-</permissions>
diff --git a/out/arm/common/etc/permissions/com.google.android.maps.xml b/out/arm/common/etc/permissions/com.google.android.maps.xml
deleted file mode 100644
index 5be5c2c..0000000
--- a/out/arm/common/etc/permissions/com.google.android.maps.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source 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.
--->
-
-<permissions>
-    <library name="com.google.android.maps"
-            file="/system/framework/com.google.android.maps.jar" />
-</permissions>
diff --git a/out/arm/common/etc/permissions/com.google.android.media.effects.xml b/out/arm/common/etc/permissions/com.google.android.media.effects.xml
deleted file mode 100644
index ea82b9d..0000000
--- a/out/arm/common/etc/permissions/com.google.android.media.effects.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source 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.
--->
-
-<permissions>
-    <library name="com.google.android.media.effects"
-            file="/system/framework/com.google.android.media.effects.jar" />
-
-</permissions>
diff --git a/out/arm/common/etc/permissions/com.google.widevine.software.drm.xml b/out/arm/common/etc/permissions/com.google.widevine.software.drm.xml
deleted file mode 100644
index f75abf9..0000000
--- a/out/arm/common/etc/permissions/com.google.widevine.software.drm.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-      Copyright (C) 2011 Google, Inc.  All Rights Reserved
--->
-<permissions>
-    <library name="com.google.widevine.software.drm"
-        file="/system/framework/com.google.widevine.software.drm.jar"/>
-</permissions>
diff --git a/out/arm/common/framework/com.google.android.camera2.jar b/out/arm/common/framework/com.google.android.camera2.jar
deleted file mode 100644
index 8bc83cb..0000000
Binary files a/out/arm/common/framework/com.google.android.camera2.jar and /dev/null differ
diff --git a/out/arm/common/framework/com.google.android.maps.jar b/out/arm/common/framework/com.google.android.maps.jar
deleted file mode 100644
index 02524f6..0000000
Binary files a/out/arm/common/framework/com.google.android.maps.jar and /dev/null differ
diff --git a/out/arm/common/framework/com.google.android.media.effects.jar b/out/arm/common/framework/com.google.android.media.effects.jar
deleted file mode 100644
index 4cc5668..0000000
Binary files a/out/arm/common/framework/com.google.android.media.effects.jar and /dev/null differ
diff --git a/out/arm/common/framework/com.google.widevine.software.drm.jar b/out/arm/common/framework/com.google.widevine.software.drm.jar
deleted file mode 100644
index 52b38cb..0000000
Binary files a/out/arm/common/framework/com.google.widevine.software.drm.jar and /dev/null differ
diff --git a/out/arm/common/gapps_scripts.sh b/out/arm/common/gapps_scripts.sh
deleted file mode 100644
index 6b0f5dd..0000000
--- a/out/arm/common/gapps_scripts.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/sh
-
-good_ffc_device() {
-  if cat /proc/cpuinfo |grep -q Victory; then
-    return 1
-  fi
-  if cat /proc/cpuinfo |grep -q herring; then
-    return 1
-  fi
-  if cat /proc/cpuinfo |grep -q sun4i; then
-    return 1
-  fi
-  return 0
-}
-
-chmod 755 /system/addon.d/30-gapps.sh
-if [ -f "/system/addon.d/faceunlock.sh" ]; then
-    chmod 755 /system/addon.d/31-faceunlock.sh
-fi
-if good_ffc_device && [ -e /system/etc/permissions/android.hardware.camera.front.xml ]; then
-  chmod 755 /system/addon.d/31-faceunlock.sh
-elif  [ -d /system/vendor/pittpatt/ ]; then
-  rm -rf /system/vendor/pittpatt/
-  rm -rf /system/app/FaceLock/
-  rm  -f /system/lib/libfacelock_jni.so
-  rm  -f /system/addon.d/31-faceunlock.sh
-fi
-rm -rf /tmp/face
diff --git a/out/arm/common/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk b/out/arm/common/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
deleted file mode 100644
index 4589c91..0000000
Binary files a/out/arm/common/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk and /dev/null differ
diff --git a/out/arm/common/priv-app/GoogleFeedback/GoogleFeedback.apk b/out/arm/common/priv-app/GoogleFeedback/GoogleFeedback.apk
deleted file mode 100644
index 5217ccd..0000000
Binary files a/out/arm/common/priv-app/GoogleFeedback/GoogleFeedback.apk and /dev/null differ
diff --git a/out/arm/common/priv-app/GoogleLoginService/GoogleLoginService.apk b/out/arm/common/priv-app/GoogleLoginService/GoogleLoginService.apk
deleted file mode 100644
index 685d1bd..0000000
Binary files a/out/arm/common/priv-app/GoogleLoginService/GoogleLoginService.apk and /dev/null differ
diff --git a/out/arm/common/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk b/out/arm/common/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk
deleted file mode 100644
index 4dac6c7..0000000
Binary files a/out/arm/common/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk and /dev/null differ
diff --git a/out/arm/common/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk b/out/arm/common/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk
deleted file mode 100644
index dcdba29..0000000
Binary files a/out/arm/common/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk and /dev/null differ
diff --git a/out/arm/common/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk b/out/arm/common/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk
deleted file mode 100644
index 2523747..0000000
Binary files a/out/arm/common/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk and /dev/null differ
diff --git a/out/arm/common/priv-app/Phonesky/Phonesky.apk b/out/arm/common/priv-app/Phonesky/Phonesky.apk
deleted file mode 100644
index 588ce53..0000000
Binary files a/out/arm/common/priv-app/Phonesky/Phonesky.apk and /dev/null differ
diff --git a/out/arm/common/priv-app/SetupWizard/SetupWizard.apk b/out/arm/common/priv-app/SetupWizard/SetupWizard.apk
deleted file mode 100644
index 0a208e4..0000000
Binary files a/out/arm/common/priv-app/SetupWizard/SetupWizard.apk and /dev/null differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin b/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin
deleted file mode 100644
index eeb495e..0000000
Binary files a/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/landmark_group_meta_data.bin and /dev/null differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin b/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
deleted file mode 100644
index 8292c58..0000000
Binary files a/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin and /dev/null differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin b/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin
deleted file mode 100644
index 90292d4..0000000
Binary files a/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32-tree7-wmd.bin and /dev/null differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin b/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin
deleted file mode 100644
index bccd30a..0000000
Binary files a/out/arm/common/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.8/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-3-tree7-wmd.bin and /dev/null differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin
deleted file mode 100644
index 343e4ea..0000000
Binary files a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-r0-ri30.4a-v24-tree7-2-wmd.bin and /dev/null differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin
deleted file mode 100644
index 6708d71..0000000
Binary files a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rn30-ri30.5-v24-tree7-2-wmd.bin and /dev/null differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin
deleted file mode 100644
index dbca576..0000000
Binary files a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/head-y0-yi45-p0-pi45-rp30-ri30.5-v24-tree7-2-wmd.bin and /dev/null differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin
deleted file mode 100644
index 5d8f45f..0000000
Binary files a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-r.8.1.bin and /dev/null differ
diff --git a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin b/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin
deleted file mode 100644
index 997f486..0000000
Binary files a/out/arm/common/vendor/pittpatt/models/detection/yaw_roll_face_detectors.7.1/pose-y-r.8.1.bin and /dev/null differ
diff --git a/out/arm/common/vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin b/out/arm/common/vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin
deleted file mode 100644
index cf6386c..0000000
Binary files a/out/arm/common/vendor/pittpatt/models/recognition/face.face.y0-y0-71-N-tree_7-wmd.bin and /dev/null differ