diff --git a/usr/bin/archboot-not-installed.sh b/usr/bin/archboot-not-installed.sh
index bd4204230..6e3e47bb6 100755
--- a/usr/bin/archboot-not-installed.sh
+++ b/usr/bin/archboot-not-installed.sh
@@ -18,4 +18,6 @@ for i in $(cat packages.txt); do
         pacman -S ${i} --noconfirm --overwrite '*'
     fi
 done
+# remove false positives
+grep -v "linux-firmware-marvell pambase pacman-mirrorlist licenses" uninstalled.txt >uninstalled.txt
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/usr/lib/archboot/login.sh b/usr/lib/archboot/login.sh
index 39f7d8c9e..663b9522b 100644
--- a/usr/lib/archboot/login.sh
+++ b/usr/lib/archboot/login.sh
@@ -155,10 +155,11 @@ if ! [[ -e "/.vconsole-run" ]]; then
 fi
 if ! [[ -e "/.clean-pacman-db" ]]; then
     touch /.clean-pacman-db
-    _RM_PACMAN_DB="grub libxml2 icu gettext refind amd-ucode intel-ucode edk2-shell \
+    _RM_PACMAN_DB="base grub libxml2 icu gettext refind amd-ucode intel-ucode edk2-shell \
         libisoburn libburn libisofs mkinitcpio memtest linux-api-headers jansson libwbclient \
-        libbsd libmd libpcap libnftnl libnfnetlink libnetfilter_conntrack libsasl libldap mtools \
-        libsysprof-capture libnsl libksba gdbm binutils cdrtools systemd-ukify"
+        libbsd libmd libpcap libnftnl libnfnetlink libnetfilter_conntrack libsasl libldap memtest86+ \
+        memtest86+-efi mkinitcpio-busybox mtools libsysprof-capture libnsl libksba gdbm binutils \
+        cdrtools systemd-ukify python python-pe"
     for i in ${_RM_PACMAN_DB}; do
         rm -rf /var/lib/pacman/local/"${i}"-[0-9]* &>/dev/null
     done
diff --git a/usr/lib/initcpio/install/archboot_base_common b/usr/lib/initcpio/install/archboot_base_common
index 43f44a31f..3f0ea5c19 100644
--- a/usr/lib/initcpio/install/archboot_base_common
+++ b/usr/lib/initcpio/install/archboot_base_common
@@ -214,9 +214,6 @@ build ()
     add_file /usr/share/ca-certificates/trust-source/mozilla.trust.p11-kit
     add_file /usr/share/p11-kit/modules/p11-kit-trust.module
 
-    ### add secure boot MOK
-    add_full_dir /usr/share/archboot/keys
-
     ### remove conflicting mkinitcpio files and grub
     rm ${BUILDROOT}/usr/lib/systemd/system/mkinitcpio-generate-shutdown-ramfs.service \
         ${BUILDROOT}/usr/lib/systemd/system/shutdown.target.wants/mkinitcpio-generate-shutdown-ramfs.service \