diff --git a/nixos/machines/ghatanothoa/configuration.nix b/nixos/machines/ghatanothoa/configuration.nix
deleted file mode 100644
index 6beb467..0000000
--- a/nixos/machines/ghatanothoa/configuration.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-flake-inputs:
-{config, pkgs, lib, ... }: {
-
-imports = [
-  ./hardware-configuration.nix
-  (import ./jitsi.nix flake-inputs)
-  ../../roles
-  ../../roles/xen_guest.nix
-  ./network.nix
-];
-
-# System configuration here
-
-  networking.hostName = "ghatanothoa";
-  system.stateVersion = "23.11";
-}
diff --git a/nixos/machines/ghatanothoa/hardware-configuration.nix b/nixos/machines/ghatanothoa/hardware-configuration.nix
deleted file mode 100644
index a8da712..0000000
--- a/nixos/machines/ghatanothoa/hardware-configuration.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{config, lib, pkgs, modulesPath, ...}: {
-  imports = [ ];
-
-  fileSystems."/" = {
-    device = "gha-root";
-    fsType = "tmpfs";
-    options = [ "size=1G" "mode=755" ];
-  };
-  fileSystems."/persist" = {
-    device = "/dev/disk/by-uuid/a72da670-f631-49b1-bcb3-6d378cc1f2d0"; #TODO
-    fsType = "btrfs";
-    options = [ "subvol=persist" ];
-    neededForBoot = true;
-  };
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/75b01f48-e159-4d72-b049-54b7af072076"; #TODO
-    fsType = "ext4";
-  };
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/a72da670-f631-49b1-bcb3-6d378cc1f2d0"; #TODO
-    fsType = "btrfs";
-    options = [ "subvol=nix" ];
-  };
-
-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/8bc30d17-3c08-4648-ab18-8c723523be1a"; }]; #TODO
-
-  nix.settings.max-jobs = lib.mkDefault 4;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}
diff --git a/nixos/machines/ghatanothoa/jitsi.nix b/nixos/machines/ghatanothoa/jitsi.nix
deleted file mode 100644
index debe612..0000000
--- a/nixos/machines/ghatanothoa/jitsi.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-flake-inputs:
-{pkgs, config, lib, ...}: {
-
-}
diff --git a/nixos/machines/ghatanothoa/network.nix b/nixos/machines/ghatanothoa/network.nix
deleted file mode 100644
index 7e26f79..0000000
--- a/nixos/machines/ghatanothoa/network.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-# We sohuld put that config somewhere in roles and give it a parameter or something,
-# everyone gets the same nameserver and the same prefixLength and address vs defaultGateway alsways
-# depend on the same thing 
-{
-  imports = [ ];
-  networking = {
-    interfaces.enX0.ipv4.addresses = [ {
-      address = "192.168.0.25";
-      prefixLength = 16;
-    } ];
-    defaultGateway = "192.168.0.152";
-    nameservers = ["130.83.2.22" "130.83.56.60" "130.83.22.60" "130.82.22.63"];
-  };
-}
-
diff --git a/nixos/roles/admins.nix b/nixos/roles/admins.nix
index 32478bf..43a86aa 100644
--- a/nixos/roles/admins.nix
+++ b/nixos/roles/admins.nix
@@ -10,13 +10,6 @@ let
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEdA4LpEGUUmN8esFyrNZXFb2GiBID9/S6zzhcnofQuP nerf@nerflap2"
         ];
     };
-    gonne = {
-      hashedPassword =
-        "$6$EtGpHEcFkOi0yUWp$slXf0CvIUrhdqaoCrQ5YwtYu2IVuE1RGGst4fnDPRLWVm.lYx0ruvSAF2/vw/sLbW37ORJjlb0NHQ.kSG7cVY/";
-        keys = [
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFopCUadohY3wg9AoEup9TDRDMyEPSLsQoCnN4lsKCrr gonne@mathebau.de NixOS"
-        ];
-    };
   };
 
   mkAdmin = name :