diff --git a/layers/base.nix b/layers/base.nix
index 1c1d75c2646d4a717044afdaf39a40c3a4418826..2a049e7ffe763053dac034516c827c377f0b32f4 100644
--- a/layers/base.nix
+++ b/layers/base.nix
@@ -29,7 +29,7 @@ in
   nixpkgs.config.allowUnfree = true;
 
   # Always run the latest kernel
-  boot.kernelPackages = pkgs.linuxPackages_latest;
+  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
 
   boot.tmpOnTmpfs = true;
 
@@ -38,9 +38,6 @@ in
   # Restore systemd default
   services.logind.killUserProcesses = true;
 
-  # Freezes on shutdown on some machines. Also probably should only be enabled when required?
-  security.rngd.enable = lib.mkDefault false;
-
   time.timeZone = "Europe/Berlin";
 
   # German locale with english messages
@@ -93,7 +90,6 @@ in
 
     pwgen
     mosquitto
-    gopass
     unzip
     file
     darkhttpd