diff --git a/scripts/customize.sh b/scripts/customize.sh
index 9c91e63..41eb925 100755
--- a/scripts/customize.sh
+++ b/scripts/customize.sh
@@ -37,13 +37,10 @@ fi
 if [ $INS = true ]; then
 	ui_print "* Updating __PKGNAME (v__PKGVER)"
 	set_perm $MODPATH/__PKGNAME.apk 1000 1000 644 u:object_r:apk_data_file:s0
-	ADBV=$(settings get global verifier_verify_adb_installs)
-	[ $ADBV = 1 ] && settings put global verifier_verify_adb_installs 0
 	if ! op=$(pm install --user 0 -i com.android.vending -r -d $MODPATH/__PKGNAME.apk 2>&1); then
 		ui_print "ERROR: APK installation failed!"
 		abort "$op"
 	fi
-	[ $ADBV = 1 ] && settings put global verifier_verify_adb_installs $ADBV
 	BASEPATH=$(pm path __PKGNAME | grep base)
 	BASEPATH=${BASEPATH#*:}
 	if [ -z "$BASEPATH" ]; then
@@ -54,7 +51,7 @@ BASEPATHLIB=${BASEPATH%base.apk}lib/${ARCH}
 if [ -z "$(ls -A1 ${BASEPATHLIB})" ]; then
 	ui_print "* Extracting native libs"
 	mkdir -p $BASEPATHLIB
-	if ! op=$(unzip -j $MODPATH/__EXTRCT lib/${ARCH_LIB}/* -d ${BASEPATHLIB} 2>&1); then
+	if ! op=$(unzip -j $MODPATH/__PKGNAME.apk lib/${ARCH_LIB}/* -d ${BASEPATHLIB} 2>&1); then
 		ui_print "ERROR: extracting native libs failed"
 		abort "$op"
 	fi
diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh
index 84b56c0..2efdbe5 100755
--- a/scripts/uninstall.sh
+++ b/scripts/uninstall.sh
@@ -5,10 +5,4 @@
 	NVBASE=${MODULES%/*}
 	rm $NVBASE/rvhc/__PKGNAME_rv.apk
 	rmdir $NVBASE/rvhc
-	if __ISBNDL :; then
-		until [ "$(getprop sys.boot_completed)" = 1 ]; do sleep 1; done
-		until [ "$(getprop init.svc.bootanim)" = stopped ]; do sleep 1; done
-		sleep 3
-		pm uninstall __PKGNAME
-	fi
 } &