diff --git a/roles/admin.nix b/roles/admin.nix
index e9e67fc..7c976a9 100644
--- a/roles/admin.nix
+++ b/roles/admin.nix
@@ -4,10 +4,9 @@ let
   unstable = import <nixos-unstable> {};
 in {
   environment.systemPackages = with pkgs; [
-    cryptsetup
     kubectl
+    cryptsetup
     unstable.kubernetes-helm
-    whois
 
     # podman
     conmon
diff --git a/roles/base.nix b/roles/base.nix
index e76d8c9..54a7eb5 100644
--- a/roles/base.nix
+++ b/roles/base.nix
@@ -16,14 +16,12 @@ in {
     jq
     ncdu
     openssl
-    pv
     ripgrep
-    sysstat
     tcpdump
     tmux
-    unzip
     wget
     z-lua
+    unzip
     unstable.starship
     (import ../packages/neovim.nix)
   ];
diff --git a/roles/desktop.nix b/roles/desktop.nix
index 1e6d25a..6add57b 100644
--- a/roles/desktop.nix
+++ b/roles/desktop.nix
@@ -104,9 +104,6 @@ in {
     )
   ];
 
-  hardware.bluetooth.enable = true;
-  services.blueman.enable = true;
-
   services.gvfs = {
     enable = true;
     package = lib.mkForce pkgs.gnome3.gvfs;