diff --git a/remove-unconfigured-packages.sh b/remove-unconfigured-packages.sh
index bbc0aef..78fe311 100755
--- a/remove-unconfigured-packages.sh
+++ b/remove-unconfigured-packages.sh
@@ -1,20 +1,25 @@
 #!/usr/bin/env bash
 
+set -o nounset
+set -o errexit
+
+cpu="$(yaml2json < _machines/"$(hostname --short)".yml | jq --raw-output .cpu)"
+gpu="$(yaml2json < _machines/"$(hostname --short)".yml | jq --raw-output .gpu)"
+
+if [[ "${cpu}" ]] ; then
+   readarray -d $'\0' -t cpu_packages < <(<drivers.yml yaml2json | jq --raw-output0 ".cpu.${cpu}[]")
+fi
+
+if [[ "${gpu}" ]] ; then
+   readarray -d $'\0' -t gpu_packages < <(<drivers.yml yaml2json | jq --raw-output0 ".gpu.${gpu}[]")
+fi
+
 declare -a aurdeps=()
 
 proctected=(
-  intel-ucode
-  amd-ucode
   base
   java-runtime-common
   jdk17-openjdk
-  lib32-vulkan-radeon
-  vulkan-radeon
-  libva-mesa-driver
-  mesa-vdpau
-  lib32-mesa-vdpau
-  vulkan-mesa-layers
-  lib32-libva-mesa-driver
 )
 
 for pkgbuild in pkgbuilds/*/PKGBUILD ; do
@@ -22,12 +27,12 @@ for pkgbuild in pkgbuilds/*/PKGBUILD ; do
   aurdeps+=("${depends[@]%%[<=>]*}" "${makedepends[@]%%[<=>]*}" "${pkgname}")
 done
 
-packages_to_remove=()
+declare -a packages_to_remove=()
 
 readarray -d $'\0' -t packages_to_remove < <(comm --zero-terminated -13 \
   <(cat \
     <(<packages.yml yaml2json | jq --raw-output0 'map(.archlinux) | flatten[]') \
-    <(for dep in "${aurdeps[@]}" ; do printf '%s\0' "${dep}" ; done) \
+    <(for dep in "${aurdeps[@]}" "${cpu_packages[@]}" "${gpu_packages[@]}" ; do printf '%s\0' "${dep}" ; done) \
   | sort -zu) \
   <(pacman -Qq --explicit | xargs -I "{}" printf '%s\0' "{}" | sort -zu) \
 | while IFS= read -r -d $'\0' package; do
@@ -43,7 +48,7 @@ readarray -d $'\0' -t packages_to_remove < <(comm --zero-terminated -13 \
     printf '%s\0' "${package}"
   done) 
 
-if (( "${#packages_to_remove}" > 0 )) ; then
+if (( "${#packages_to_remove[@]}" > 0 )) ; then
     sudo pacman -Rcns "${packages_to_remove[@]}" "${@}" || exit $?
     exit 123
 fi