diff --git a/flake.nix b/flake.nix
index a956731..da2ef10 100644
--- a/flake.nix
+++ b/flake.nix
@@ -74,13 +74,6 @@
       "ponyo" = mkSystem "x86_64-linux" nixpkgs ./machines/ponyo/configuration.nix;
       "router" = mkSystem "x86_64-linux" nixpkgs-unstable ./machines/router/configuration.nix;
       "s0" = mkSystem "x86_64-linux" nixpkgs-unstable ./machines/storage/s0/configuration.nix;
-      "n1" = mkSystem "aarch64-linux" nixpkgs ./machines/compute/n1/configuration.nix;
-      "n2" = mkSystem "aarch64-linux" nixpkgs ./machines/compute/n2/configuration.nix;
-      "n3" = mkSystem "aarch64-linux" nixpkgs ./machines/compute/n3/configuration.nix;
-      "n4" = mkSystem "aarch64-linux" nixpkgs ./machines/compute/n4/configuration.nix;
-      "n5" = mkSystem "aarch64-linux" nixpkgs ./machines/compute/n5/configuration.nix;
-      "n6" = mkSystem "aarch64-linux" nixpkgs ./machines/compute/n6/configuration.nix;
-      "n7" = mkSystem "aarch64-linux" nixpkgs ./machines/compute/n7/configuration.nix;
     };
 
     packages = let
diff --git a/machines/compute/common.nix b/machines/compute/common.nix
deleted file mode 100644
index cd51b68..0000000
--- a/machines/compute/common.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ config, ... }:
-
-{
-  # NixOS wants to enable GRUB by default
-  boot.loader.grub.enable = false;
-  # Enables the generation of /boot/extlinux/extlinux.conf
-  boot.loader.generic-extlinux-compatible.enable = true;
-
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-label/NIXOS_SD";
-      fsType = "ext4";
-    };
-  };
-
-  system.autoUpgrade.enable = true;
-
-  networking.interfaces.eth0.useDHCP = true;
-
-  hardware.deviceTree.enable = true;
-  hardware.deviceTree.overlays = [
-    ./sopine-baseboard-ethernet.dtbo # fix pine64 clusterboard ethernet
-  ];
-}
\ No newline at end of file
diff --git a/machines/compute/n1/configuration.nix b/machines/compute/n1/configuration.nix
deleted file mode 100644
index 0803930..0000000
--- a/machines/compute/n1/configuration.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common.nix
-  ];
-
-  networking.hostName = "n1";
-}
\ No newline at end of file
diff --git a/machines/compute/n2/configuration.nix b/machines/compute/n2/configuration.nix
deleted file mode 100644
index b427bab..0000000
--- a/machines/compute/n2/configuration.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common.nix
-  ];
-
-  networking.hostName = "n2";
-}
\ No newline at end of file
diff --git a/machines/compute/n3/configuration.nix b/machines/compute/n3/configuration.nix
deleted file mode 100644
index 06b871a..0000000
--- a/machines/compute/n3/configuration.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common.nix
-  ];
-
-  networking.hostName = "n3";
-}
\ No newline at end of file
diff --git a/machines/compute/n4/configuration.nix b/machines/compute/n4/configuration.nix
deleted file mode 100644
index 207245f..0000000
--- a/machines/compute/n4/configuration.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common.nix
-  ];
-
-  networking.hostName = "n4";
-}
\ No newline at end of file
diff --git a/machines/compute/n5/configuration.nix b/machines/compute/n5/configuration.nix
deleted file mode 100644
index b248175..0000000
--- a/machines/compute/n5/configuration.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common.nix
-  ];
-
-  networking.hostName = "n5";
-}
\ No newline at end of file
diff --git a/machines/compute/n6/configuration.nix b/machines/compute/n6/configuration.nix
deleted file mode 100644
index 0856d4e..0000000
--- a/machines/compute/n6/configuration.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common.nix
-  ];
-
-  networking.hostName = "n6";
-}
\ No newline at end of file
diff --git a/machines/compute/n7/configuration.nix b/machines/compute/n7/configuration.nix
deleted file mode 100644
index 0b2c495..0000000
--- a/machines/compute/n7/configuration.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, ... }:
-
-{
-  imports = [
-    ../common.nix
-  ];
-
-  networking.hostName = "n7";
-}
\ No newline at end of file
diff --git a/machines/compute/sopine-baseboard-ethernet.dtbo b/machines/compute/sopine-baseboard-ethernet.dtbo
deleted file mode 100644
index aad9bc9..0000000
Binary files a/machines/compute/sopine-baseboard-ethernet.dtbo and /dev/null differ
diff --git a/machines/compute/sopine-baseboard-ethernet.dts b/machines/compute/sopine-baseboard-ethernet.dts
deleted file mode 100644
index 0644c18..0000000
--- a/machines/compute/sopine-baseboard-ethernet.dts
+++ /dev/null
@@ -1,15 +0,0 @@
-/dts-v1/;
-
-/ {
-	model = "SoPine with baseboard";
-	compatible = "pine64,sopine-baseboard\0pine64,sopine\0allwinner,sun50i-a64";
-
-	fragment@0 {
-/*		target = <&ethernet@1c30000>; */
-		target-path = "/soc/ethernet@1c30000";
-		__overlay__ {
-			allwinner,tx-delay-ps = <500>;
-		};
-	};
-
-};