diff --git a/machines/jimbo/configuration.nix b/machines/jimbo/configuration.nix
deleted file mode 100644
index a932223..0000000
--- a/machines/jimbo/configuration.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  imports = [
-    # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-    ../../roles/all.nix
-    ../../roles/laptop.nix
-    ../../modules/luks.nix
-    ../../modules/grub.nix
-    ../../modules/k40.nix
-
-    # import hardware specific settings
-    <nixos-hardware/dell/xps/13-9300>
-  ];
-
-  networking.hostName = "jimbo"; # Define your hostname.
-
-  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
-  networking.useDHCP = false;
-  networking.networkmanager.enable = true;
-  programs.nm-applet.enable = true;
-
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-  };
-
-  services.openssh.enable = true;
-  programs.ssh.startAgent = true;
-
-  system.stateVersion = "21.11"; # Did you read the comment?
-
-}
-
diff --git a/machines/jimbo/hardware-configuration.nix b/machines/jimbo/hardware-configuration.nix
deleted file mode 100644
index 283b515..0000000
--- a/machines/jimbo/hardware-configuration.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelParams = [ "mem_sleep_default=deep" ]; # Enable real deepsleep suspend
-  boot.extraModulePackages = [config.boot.kernelPackages.ddcci-driver];
-  boot.kernelModules = ["kvm-intel" "i2c-dev" "ddcci_backlight"];
-
-  fileSystems."/" =
-    {
-      device = "/dev/disk/by-uuid/b9edb32f-fb40-4d59-8abe-b187c88667d6";
-      fsType = "ext4";
-    };
-
-  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/e2d53876-3fdc-486a-a354-ec834b256e43";
-
-  fileSystems."/boot/efi" =
-    {
-      device = "/dev/disk/by-uuid/502E-A0DC";
-      fsType = "vfat";
-    };
-
-  swapDevices = [{
-    device = "/dev/disk/by-partuuid/c231f5ef-0f45-4e96-87e9-76ed935e8332";
-    randomEncryption = true;
-  }];
-
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/machines/milhouse/configuration.nix b/machines/milhouse/configuration.nix
deleted file mode 100644
index 9c8581f..0000000
--- a/machines/milhouse/configuration.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ config, pkgs, ... }:
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ../../roles/all.nix
-      ../../roles/laptop.nix
-      ../../modules/luks.nix
-      ../../modules/grub.nix
-      ../../modules/k40.nix
-
-    # import hardware specific settings
-    <nixos-hardware/lenovo/thinkpad/x270>
-    ];
-
-  networking.hostName = "milhouse"; # Define your hostname.
-
-  networking.useDHCP = false;
-  networking.networkmanager.enable = true;
-  programs.nm-applet.enable = true;
-
-  system.stateVersion = "21.11"; # Did you read the comment?
-
-  # Only 1080p :(
-  my.highDPI = false;
-
-}
-
diff --git a/machines/milhouse/hardware-configuration.nix b/machines/milhouse/hardware-configuration.nix
deleted file mode 100644
index 2063922..0000000
--- a/machines/milhouse/hardware-configuration.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/74f34f3c-a946-4f13-baa7-8c767eca4750";
-      fsType = "ext4";
-    };
-
-  boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/19bd5375-ca55-427e-baaa-a3ec0f519441";
-
-  fileSystems."/boot/efi" =
-    { device = "/dev/disk/by-uuid/E497-94F9";
-      fsType = "vfat";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/0219f812-af41-404f-a19d-e337db6bebe0"; }
-    ];
-
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}