diff --git a/hosts/yodaHedgehog/configuration.nix b/hosts/yodaHedgehog/configuration.nix
index 6bd5b96..1a4c483 100644
--- a/hosts/yodaHedgehog/configuration.nix
+++ b/hosts/yodaHedgehog/configuration.nix
@@ -9,47 +9,16 @@
       ../../modules/base.nix
       ../../modules/headless.nix
 
-      #../../modules/gnome-base.nix
-      #../../modules/gnome-config.nix
-      #../../modules/gnome-extensions.nix
-      #../../modules/gnome-fractional-scaling.nix
-
-      #../../modules/programs.nix
-      #../../modules/games.nix
-      #../../modules/boxes.nix
-      #../../modules/freetube.nix
-      #../../modules/jetbrains-ide.nix
-      #../../modules/vscodium.nix
-      #../../modules/signal-desktop.nix
-      #../../modules/element-desktop.nix
-      #../../modules/joplin-desktop.nix
-      #../../modules/tor-browser.nix
-      #../../modules/autostart.nix
-      #../../modules/wallpaper.nix
-      #../../modules/fwupd-gnome.nix
-      #../../modules/print-and-scan.nix
       ../../modules/ssh-fde-unlock.nix
-      #../../modules/nextcloud-integration.nix
       #../../modules/git.nix
       ../../modules/zsh.nix
-      #../../modules/nitrokey-gpg-smartcard.nix
       #../../modules/ssh-client.nix
       ../../modules/ssh-server.nix
-      #../../modules/firefox.nix
-      #../../modules/thunderbird.nix
-      #../../modules/digikam-rawtherapee.nix
-      #../../modules/ghostwriter.nix
-      #../../modules/android.nix
-      #../../modules/pmbootstrap.nix
-      #../../modules/podman.nix
-      #../../modules/docker.nix
-      #../../modules/docker-pushrm.nix
-      #../../modules/lid-switch-handling.nix
+
       ../../modules/sendmail-mta.nix
       ../../modules/journalwatch.nix
-      #../../modules/waydroid.nix
-      #../../modules/ntfs.nix
-      #../../modules/veracrypt.nix
+
+      # TODO
       #../../modules/btrbk
       #../../modules/spin-down.nix
 
@@ -63,6 +32,5 @@
   #yoda.btrfsMounts = yoda.btrfsFileSystems;
 
   boot.kernelParams = [];
-
   boot.kernelPackages = pkgs.linuxPackages;
 }
diff --git a/hosts/yodaNas/configuration.nix b/hosts/yodaNas/configuration.nix
index 1988044..ed3702d 100644
--- a/hosts/yodaNas/configuration.nix
+++ b/hosts/yodaNas/configuration.nix
@@ -9,47 +9,19 @@
       ../../modules/base.nix
       ../../modules/headless.nix
 
-      #../../modules/gnome-base.nix
-      #../../modules/gnome-config.nix
-      #../../modules/gnome-extensions.nix
-      #../../modules/gnome-fractional-scaling.nix
-
-      #../../modules/programs.nix
-      #../../modules/games.nix
-      #../../modules/boxes.nix
-      #../../modules/freetube.nix
-      #../../modules/jetbrains-ide.nix
-      #../../modules/vscodium.nix
-      #../../modules/signal-desktop.nix
-      #../../modules/element-desktop.nix
-      #../../modules/joplin-desktop.nix
-      #../../modules/tor-browser.nix
-      #../../modules/autostart.nix
-      #../../modules/wallpaper.nix
-      #../../modules/fwupd-gnome.nix
-      #../../modules/print-and-scan.nix
       ../../modules/ssh-fde-unlock.nix
-      #../../modules/nextcloud-integration.nix
       #../../modules/git.nix
       ../../modules/zsh.nix
-      #../../modules/nitrokey-gpg-smartcard.nix
       #../../modules/ssh-client.nix
       ../../modules/ssh-server.nix
-      #../../modules/firefox.nix
-      #../../modules/thunderbird.nix
-      #../../modules/digikam-rawtherapee.nix
-      #../../modules/ghostwriter.nix
-      #../../modules/android.nix
-      #../../modules/pmbootstrap.nix
+
       #../../modules/podman.nix
       ../../modules/docker.nix
       #../../modules/docker-pushrm.nix
-      #../../modules/lid-switch-handling.nix
+
       ../../modules/sendmail-mta.nix
       ../../modules/journalwatch.nix
-      #../../modules/waydroid.nix
-      #../../modules/ntfs.nix
-      #../../modules/veracrypt.nix
+
       ../../modules/btrbk
       ../../modules/de-p1st-monitor.nix
       ../../modules/spin-down.nix
@@ -64,6 +36,5 @@
   #yoda.btrfsMounts = yoda.btrfsFileSystems;
 
   boot.kernelParams = [];
-
   boot.kernelPackages = pkgs.linuxPackages;
 }
diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index 41d59e3..36d523b 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -6,7 +6,6 @@
       ../../modules/home-manager.nix
       ../../modules/nur-and-unstable.nix
       ../../modules/base.nix
-      #../../modules/headless.nix
 
       ../../modules/gnome-base.nix
       ../../modules/gnome-config.nix
@@ -14,11 +13,8 @@
       #../../modules/gnome-fractional-scaling.nix
 
       ../../modules/programs.nix
-      #../../modules/games.nix
-      #../../modules/boxes.nix
       ../../modules/freetube.nix
       ../../modules/jetbrains-ide.nix
-      #../../modules/vscodium.nix
       ../../modules/signal-desktop.nix
       ../../modules/element-desktop.nix
       ../../modules/joplin-desktop.nix
@@ -27,7 +23,6 @@
       ../../modules/wallpaper.nix
       ../../modules/fwupd-gnome.nix
       ../../modules/print-and-scan.nix
-      #../../modules/ssh-fde-unlock.nix
       ../../modules/nextcloud-integration.nix
       ../../modules/git.nix
       ../../modules/zsh.nix
@@ -38,19 +33,9 @@
       ../../modules/thunderbird.nix
       #../../modules/digikam-rawtherapee.nix
       ../../modules/ghostwriter.nix
-      #../../modules/android.nix
-      #../../modules/pmbootstrap.nix
-      #../../modules/podman.nix
-      #../../modules/docker.nix
-      #../../modules/docker-pushrm.nix
+
       ../../modules/lid-switch-handling.nix
-      ../../modules/sendmail-mta.nix
-      #../../modules/journalwatch.nix
-      #../../modules/waydroid.nix
       ../../modules/ntfs.nix
-      #../../modules/veracrypt.nix
-      #../../modules/btrbk
-      #../../modules/spin-down.nix
 
       ../../modules/btrfs-scrub.nix
       ../../modules/btrfs-mount-options.nix
@@ -64,6 +49,5 @@
   fileSystems."/mnt/512gb".options = [ "noatime" "commit=60" ]; # Ext4
 
   boot.kernelParams = [];
-
   boot.kernelPackages = pkgs.linuxPackages_latest;
 }
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index 633f063..e794110 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -6,7 +6,6 @@
       ../../modules/home-manager.nix
       ../../modules/nur-and-unstable.nix
       ../../modules/base.nix
-      #../../modules/headless.nix
 
       ../../modules/gnome-base.nix
       ../../modules/gnome-config.nix
@@ -27,7 +26,6 @@
       ../../modules/wallpaper.nix
       ../../modules/fwupd-gnome.nix
       ../../modules/print-and-scan.nix
-      #../../modules/ssh-fde-unlock.nix
       ../../modules/nextcloud-integration.nix
       ../../modules/git.nix
       ../../modules/zsh.nix
@@ -44,13 +42,8 @@
       ../../modules/docker.nix
       ../../modules/docker-pushrm.nix
       ../../modules/lid-switch-handling.nix
-      ../../modules/sendmail-mta.nix
-      #../../modules/journalwatch.nix
       #../../modules/waydroid.nix
       ../../modules/ntfs.nix
-      #../../modules/veracrypt.nix
-      #../../modules/btrbk
-      #../../modules/spin-down.nix
 
       ../../modules/btrfs-scrub.nix
       ../../modules/btrfs-mount-options.nix
diff --git a/hosts/yodaYoga/configuration.nix b/hosts/yodaYoga/configuration.nix
index a78df18..7717c8e 100644
--- a/hosts/yodaYoga/configuration.nix
+++ b/hosts/yodaYoga/configuration.nix
@@ -9,47 +9,20 @@
       ../../modules/base.nix
       ../../modules/headless.nix
 
-      #../../modules/gnome-base.nix
-      #../../modules/gnome-config.nix
-      #../../modules/gnome-extensions.nix
-      #../../modules/gnome-fractional-scaling.nix
-
-      #../../modules/programs.nix
-      #../../modules/games.nix
-      #../../modules/boxes.nix
-      #../../modules/freetube.nix
-      #../../modules/jetbrains-ide.nix
-      #../../modules/vscodium.nix
-      #../../modules/signal-desktop.nix
-      #../../modules/element-desktop.nix
-      #../../modules/joplin-desktop.nix
-      #../../modules/tor-browser.nix
-      #../../modules/autostart.nix
-      #../../modules/wallpaper.nix
-      #../../modules/fwupd-gnome.nix
-      #../../modules/print-and-scan.nix
       ../../modules/ssh-fde-unlock.nix
-      #../../modules/nextcloud-integration.nix
       #../../modules/git.nix
       ../../modules/zsh.nix
-      #../../modules/nitrokey-gpg-smartcard.nix
       #../../modules/ssh-client.nix
       ../../modules/ssh-server.nix
-      #../../modules/firefox.nix
-      #../../modules/thunderbird.nix
-      #../../modules/digikam-rawtherapee.nix
-      #../../modules/ghostwriter.nix
-      #../../modules/android.nix
-      #../../modules/pmbootstrap.nix
+
       #../../modules/podman.nix
       ../../modules/docker.nix
       #../../modules/docker-pushrm.nix
+
       ../../modules/lid-switch-handling.nix
       ../../modules/sendmail-mta.nix
       ../../modules/journalwatch.nix
-      #../../modules/waydroid.nix
-      #../../modules/ntfs.nix
-      #../../modules/veracrypt.nix
+
       #../../modules/btrbk
       #../../modules/spin-down.nix
 
@@ -63,6 +36,5 @@
   #yoda.btrfsMounts = yoda.btrfsFileSystems;
 
   boot.kernelParams = [];
-
   boot.kernelPackages = pkgs.linuxPackages;
 }