diff --git a/systems/bob/default.nix b/systems/bob/default.nix
index 638dd2f..7cfff86 100644
--- a/systems/bob/default.nix
+++ b/systems/bob/default.nix
@@ -3,7 +3,6 @@
   imports = [
     "${inputs.self}/users/math"
     "${inputs.self}/users/richie"
-    "${inputs.self}/users/steve"
     "${inputs.self}/common/global"
     "${inputs.self}/common/optional/docker.nix"
     "${inputs.self}/common/optional/monitoring-agent.nix"
diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix
index 9f1a836..242f708 100644
--- a/systems/jeeves/default.nix
+++ b/systems/jeeves/default.nix
@@ -1,4 +1,4 @@
-{ inputs, lib, ... }:
+{ inputs, ... }:
 let
   vars = import ./vars.nix;
 in
@@ -6,7 +6,6 @@ in
   imports = [
     "${inputs.self}/users/math"
     "${inputs.self}/users/richie"
-    "${inputs.self}/users/steve"
     "${inputs.self}/common/global"
     "${inputs.self}/common/optional/docker.nix"
     "${inputs.self}/common/optional/monitoring-agent.nix"
diff --git a/users/steve/default.nix b/users/steve/default.nix
deleted file mode 100644
index d9bdfe3..0000000
--- a/users/steve/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}:
-let
-  ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-in
-{
-
-  users = {
-    users.steve = {
-      isNormalUser = true;
-
-      shell = pkgs.zsh;
-      group = "steve";
-      openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJH03VzDbUhzfhvwD+OsYh6GobODYaI9jdNdzWQoqFsp matth@Jove" # cspell:disable-line
-      ];
-      extraGroups = [
-        "audio"
-        "video"
-        "wheel"
-        "users"
-      ]
-      ++ ifTheyExist [
-        "dialout"
-        "docker"
-        "hass"
-        "libvirtd"
-        "networkmanager"
-        "plugdev"
-        "scanner"
-        "transmission"
-        "uaccess"
-        "wireshark"
-      ];
-      uid = 1005;
-    };
-
-    groups.steve.gid = 1005;
-  };
-  home-manager.users.steve = import ./systems/${config.networking.hostName}.nix;
-}
diff --git a/users/steve/home/cli/default.nix b/users/steve/home/cli/default.nix
deleted file mode 100644
index 863c25f..0000000
--- a/users/steve/home/cli/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  imports = [
-    ./direnv.nix
-    ./git.nix
-    ./zsh.nix
-  ];
-
-  programs.starship.enable = true;
-}
diff --git a/users/steve/home/cli/direnv.nix b/users/steve/home/cli/direnv.nix
deleted file mode 100644
index 75129d9..0000000
--- a/users/steve/home/cli/direnv.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-
-  programs.direnv = {
-    enable = true;
-    enableZshIntegration = true;
-    nix-direnv.enable = true;
-  };
-}
diff --git a/users/steve/home/cli/git.nix b/users/steve/home/cli/git.nix
deleted file mode 100644
index d4ade0f..0000000
--- a/users/steve/home/cli/git.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  programs.git = {
-    enable = true;
-    signing.format = null;
-    settings = {
-      user = {
-        email = "matthew.michal11@gmail.com";
-        name = "Matthew Michal";
-      };
-      pull.rebase = true;
-      color.ui = true;
-    };
-    lfs.enable = true;
-  };
-}
diff --git a/users/steve/home/cli/zsh.nix b/users/steve/home/cli/zsh.nix
deleted file mode 100644
index 69cf853..0000000
--- a/users/steve/home/cli/zsh.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  programs.zsh = {
-    enable = true;
-    syntaxHighlighting.enable = true;
-    history.size = 10000;
-    oh-my-zsh = {
-      enable = true;
-      plugins = [
-        "git"
-        "docker"
-        "docker-compose"
-        "colored-man-pages"
-        "rust"
-        "systemd"
-        "tmux"
-        "ufw"
-        "z"
-      ];
-    };
-    shellAliases = {
-      "lrt" = "eza --icons -lsnew";
-      "ls" = "eza";
-      "ll" = "eza --long --group";
-      "la" = "eza --all";
-
-    };
-  };
-}
diff --git a/users/steve/home/global.nix b/users/steve/home/global.nix
deleted file mode 100644
index c23a756..0000000
--- a/users/steve/home/global.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, ... }:
-{
-  imports = [
-    ./cli
-    ./programs.nix
-    ./ssh_config.nix
-  ];
-
-  programs = {
-    home-manager.enable = true;
-    git.enable = true;
-  };
-
-  home = {
-    username = "steve";
-    homeDirectory = "/home/${config.home.username}";
-    stateVersion = "24.05";
-    sessionVariables = {
-      FLAKE = "$HOME/dotfiles";
-    };
-  };
-}
diff --git a/users/steve/home/programs.nix b/users/steve/home/programs.nix
deleted file mode 100644
index 15a46df..0000000
--- a/users/steve/home/programs.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    # cli
-    bat
-    btop
-    eza
-    fd
-    ffmpegthumbnailer
-    fzf
-    git
-    gnupg
-    imagemagick
-    jq
-    ncdu
-    ouch
-    p7zip
-    poppler
-    rar
-    ripgrep
-    starship
-    tmux
-    unzip
-    yazi
-    zoxide
-    # system info
-    hwloc
-    lynis
-    pciutils
-    smartmontools
-    usbutils
-    # networking
-    iperf3
-    nmap
-    wget
-    # python
-    ruff
-    uv
-    # nodejs
-    nodejs
-    # Rust packages
-    trunk
-    wasm-pack
-    cargo-watch
-    cargo-generate
-    cargo-audit
-    cargo-update
-    # nix
-    nix-init
-    nix-output-monitor
-    nix-prefetch
-    nix-tree
-    nixfmt
-    treefmt
-  ];
-}
diff --git a/users/steve/home/ssh_config.nix b/users/steve/home/ssh_config.nix
deleted file mode 100644
index 8b9aa69..0000000
--- a/users/steve/home/ssh_config.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  programs.ssh = {
-    enable = true;
-    enableDefaultConfig = false;
-  };
-}
diff --git a/users/steve/systems/bob.nix b/users/steve/systems/bob.nix
deleted file mode 100644
index 6bbef61..0000000
--- a/users/steve/systems/bob.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ../home/global.nix
-  ];
-}
diff --git a/users/steve/systems/jeeves.nix b/users/steve/systems/jeeves.nix
deleted file mode 100644
index 6bbef61..0000000
--- a/users/steve/systems/jeeves.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ../home/global.nix
-  ];
-}