diff --git a/hosts/fallarbor/hardware.nix b/hosts/fallarbor/hardware.nix
index 7a704c18..4bbdc412 100644
--- a/hosts/fallarbor/hardware.nix
+++ b/hosts/fallarbor/hardware.nix
@@ -37,10 +37,7 @@
 
   # Save power/better manage heat & fans.
   powerManagement.powertop.enable = true;
-  services = {
-    btrfs.autoScrub.enable = true;
-    thermald.enable = true;
-  };
+  services.thermald.enable = true;
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/hosts/lavaridge/hardware.nix b/hosts/lavaridge/hardware.nix
index 443dab45..67f7c097 100644
--- a/hosts/lavaridge/hardware.nix
+++ b/hosts/lavaridge/hardware.nix
@@ -17,7 +17,7 @@
   boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod"];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-amd" "amd-gpu"];
-  boot.kernelParams = ["amdgpu.abmlevel=0"]; # Disable AMD display management.
+  boot.kernelParams = ["amdgpu.abmlevel=0"];
   boot.extraModulePackages = [];
 
   hardware.opengl = {
@@ -30,10 +30,7 @@
     extraPackages32 = [pkgs.driversi686Linux.amdvlk];
   };
 
-  services = {
-    btrfs.autoScrub.enable = true;
-    xserver.videoDrivers = ["amdgpu"];
-  };
+  services.xserver.videoDrivers = ["amdgpu"];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/hosts/mossdeep/hardware.nix b/hosts/mossdeep/hardware.nix
index 9894ab62..3c2cdc5f 100644
--- a/hosts/mossdeep/hardware.nix
+++ b/hosts/mossdeep/hardware.nix
@@ -21,8 +21,6 @@
 
   hardware.opengl.driSupport = true;
 
-  services.btrfs.autoScrub.enable = true;
-
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
diff --git a/hosts/petalburg/hardware.nix b/hosts/petalburg/hardware.nix
index b4d7eb0a..c556fce6 100644
--- a/hosts/petalburg/hardware.nix
+++ b/hosts/petalburg/hardware.nix
@@ -41,11 +41,7 @@
 
   # Save power/better manage heat & fans.
   powerManagement.powertop.enable = true;
-
-  services = {
-    btrfs.autoScrub.enable = true;
-    thermald.enable = true;
-  };
+  services.thermald.enable = true;
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/hosts/rustboro/hardware.nix b/hosts/rustboro/hardware.nix
index 37331f7a..c1116f5e 100644
--- a/hosts/rustboro/hardware.nix
+++ b/hosts/rustboro/hardware.nix
@@ -30,8 +30,6 @@
   # Otherwise, CPU doesn't automatically clock down.
   powerManagement.cpuFreqGovernor = "ondemand";
 
-  services.btrfs.autoScrub.enable = true;
-
   # Intel drivers with accelerated video playback support.
   nixpkgs.config.packageOverrides = pkgs: {
     intel-vaapi-driver =