diff --git a/.etckeeper b/.etckeeper
index 58e8534f..e3eb3226 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -8,7 +8,6 @@ mkdir -p './NetworkManager/dnsmasq-shared.d'
 mkdir -p './NetworkManager/dnsmasq.d'
 mkdir -p './NetworkManager/system-connections'
 mkdir -p './X11/xkb'
-mkdir -p './X11/xorg.conf.d'
 mkdir -p './apache2/mods-available'
 mkdir -p './apt/auth.conf.d'
 mkdir -p './apt/listchanges.conf.d'
@@ -17,10 +16,8 @@ mkdir -p './apt/trusted.gpg.d'
 mkdir -p './avahi/services'
 mkdir -p './binfmt.d'
 mkdir -p './dbus-1/session.d'
-mkdir -p './dconf/db'
 mkdir -p './dnsmasq.d'
 mkdir -p './gdb/gdbinit.d'
-mkdir -p './glvnd/egl_vendor.d'
 mkdir -p './gss/mech.d'
 mkdir -p './initramfs-tools/conf.d'
 mkdir -p './initramfs-tools/hooks'
@@ -63,9 +60,6 @@ mkdir -p './ssh/sshd_config.d'
 mkdir -p './triggerhappy/triggers.d'
 mkdir -p './udev/hwdb.d'
 mkdir -p './usb_modeswitch.d'
-mkdir -p './vulkan/explicit_layer.d'
-mkdir -p './vulkan/icd.d'
-mkdir -p './vulkan/implicit_layer.d'
 maybe chmod 0755 '.'
 maybe chmod 0700 '.etckeeper'
 maybe chmod 0644 '.fstab'
@@ -126,7 +120,6 @@ maybe chmod 0644 'X11/Xsession.d/99x11-common_start'
 maybe chmod 0644 'X11/Xsession.options'
 maybe chmod 0644 'X11/rgb.txt'
 maybe chmod 0755 'X11/xkb'
-maybe chmod 0755 'X11/xorg.conf.d'
 maybe chmod 0644 'adduser.conf'
 maybe chmod 0644 'aliases'
 maybe chmod 0755 'alternatives'
@@ -160,7 +153,6 @@ maybe chmod 0644 'apt/apt.conf.d/20packagekit'
 maybe chmod 0644 'apt/apt.conf.d/50raspi'
 maybe chmod 0644 'apt/apt.conf.d/50unattended-upgrades'
 maybe chmod 0644 'apt/apt.conf.d/70debconf'
-maybe chmod 0644 'apt/apt.conf.d/99nymea'
 maybe chmod 0755 'apt/auth.conf.d'
 maybe chmod 0644 'apt/listchanges.conf'
 maybe chmod 0755 'apt/listchanges.conf.d'
@@ -285,8 +277,6 @@ maybe chmod 0644 'dbus-1/system.d/io.guh.nymead.conf'
 maybe chmod 0644 'dbus-1/system.d/org.freedesktop.ModemManager1.conf'
 maybe chmod 0644 'dbus-1/system.d/org.freedesktop.PackageKit.conf'
 maybe chmod 0644 'dbus-1/system.d/wpa_supplicant.conf'
-maybe chmod 0755 'dconf'
-maybe chmod 0755 'dconf/db'
 maybe chmod 0644 'debconf.conf'
 maybe chmod 0644 'debian_version'
 maybe chmod 0755 'default'
@@ -519,8 +509,6 @@ maybe chmod 0770 'gitea'
 maybe chown 'git' 'gitea/app.ini'
 maybe chgrp 'git' 'gitea/app.ini'
 maybe chmod 0644 'gitea/app.ini'
-maybe chmod 0755 'glvnd'
-maybe chmod 0755 'glvnd/egl_vendor.d'
 maybe chmod 0755 'groff'
 maybe chmod 0644 'groff/man.local'
 maybe chmod 0644 'groff/mdoc.local'
@@ -3077,10 +3065,6 @@ maybe chmod 0755 'usb_modeswitch.d'
 maybe chmod 0755 'vim'
 maybe chmod 0644 'vim/vimrc'
 maybe chmod 0644 'vim/vimrc.tiny'
-maybe chmod 0755 'vulkan'
-maybe chmod 0755 'vulkan/explicit_layer.d'
-maybe chmod 0755 'vulkan/icd.d'
-maybe chmod 0755 'vulkan/implicit_layer.d'
 maybe chmod 0644 'wgetrc'
 maybe chmod 0700 'wireguard'
 maybe chmod 0755 'wireguard/configs'
diff --git a/alternatives/libblas.so.3-arm-linux-gnueabihf b/alternatives/libblas.so.3-arm-linux-gnueabihf
deleted file mode 120000
index 34f7de38..00000000
--- a/alternatives/libblas.so.3-arm-linux-gnueabihf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/arm-linux-gnueabihf/blas/libblas.so.3
\ No newline at end of file
diff --git a/alternatives/x-cursor-theme b/alternatives/x-cursor-theme
deleted file mode 120000
index 131c2558..00000000
--- a/alternatives/x-cursor-theme
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/icons/Adwaita/cursor.theme
\ No newline at end of file
diff --git a/apt/apt.conf.d/99nymea b/apt/apt.conf.d/99nymea
deleted file mode 100644
index 23dcf22b..00000000
--- a/apt/apt.conf.d/99nymea
+++ /dev/null
@@ -1,3 +0,0 @@
-DPkg::Pre-Install-Pkgs {"/usr/libexec/nymea-upgrade-helper"; };
-DPkg::Tools::Options::/usr/libexec/nymea-upgrade-helper::Version "1";
-DPkg::Post-Invoke {"if [ -e /tmp/nymea-restart-pending ]; then systemctl restart nymead; rm /tmp/nymea-restart-pending; fi"; };
diff --git a/systemd/system/nymead.service b/systemd/system/nymead.service
new file mode 120000
index 00000000..dc1dc0cd
--- /dev/null
+++ b/systemd/system/nymead.service
@@ -0,0 +1 @@
+/dev/null
\ No newline at end of file
diff --git a/systemd/user/pk-debconf-helper.socket b/systemd/user/pk-debconf-helper.socket
new file mode 120000
index 00000000..dc1dc0cd
--- /dev/null
+++ b/systemd/user/pk-debconf-helper.socket
@@ -0,0 +1 @@
+/dev/null
\ No newline at end of file