diff --git a/nixos/machines/cherry/configuration.nix b/nixos/machines/cherry/configuration.nix
index f4c2844..dfc63da 100644
--- a/nixos/machines/cherry/configuration.nix
+++ b/nixos/machines/cherry/configuration.nix
@@ -5,8 +5,6 @@
 
     # last system packages that need to be migrated to components
     ../../system/all/borg-jobs.nix
-    #../../system/all/syncthing.nix
-    #../../system/server/netdata.nix
     ../../modules
 
     ../../components
diff --git a/nixos/machines/cream/configuration.nix b/nixos/machines/cream/configuration.nix
index de90958..a5d2409 100644
--- a/nixos/machines/cream/configuration.nix
+++ b/nixos/machines/cream/configuration.nix
@@ -5,8 +5,6 @@
 
     # last system packages that need to be migrated to components
     ../../system/all/borg-jobs.nix
-    #../../system/all/syncthing.nix
-    #../../system/server/netdata.nix
     ../../modules
 
     ../../components
diff --git a/nixos/machines/orbi/configuration.nix b/nixos/machines/orbi/configuration.nix
index 6868704..9b4a38e 100644
--- a/nixos/machines/orbi/configuration.nix
+++ b/nixos/machines/orbi/configuration.nix
@@ -4,8 +4,6 @@
     ../../system/all/nginx.nix
     ../../system/all/borg-jobs.nix
     ../../system/all/defaults.nix
-    #../../system/all/syncthing.nix
-    #../../system/server/netdata.nix
     ../../system/server/packages.nix
 
     ../../components
diff --git a/nixos/machines/orbi/media-syncthing.nix b/nixos/machines/orbi/media-syncthing.nix
index e388bff..cd55902 100644
--- a/nixos/machines/orbi/media-syncthing.nix
+++ b/nixos/machines/orbi/media-syncthing.nix
@@ -1,7 +1,5 @@
 { config, pkgs, lib, ... }: {
 
-  #imports = [ ../../system/all/syncthing.nix ];
-
   sops.secrets.syncthing_cert = { };
   sops.secrets.syncthing_key = { };
 
diff --git a/nixos/machines/robi/configuration.nix b/nixos/machines/robi/configuration.nix
index 960233c..e8b1c53 100644
--- a/nixos/machines/robi/configuration.nix
+++ b/nixos/machines/robi/configuration.nix
@@ -4,8 +4,6 @@
     ../../system/all/nginx.nix
     ../../system/all/borg-jobs.nix
     ../../system/all/defaults.nix
-    #../../system/all/syncthing.nix
-    #../../system/server/netdata.nix
     ../../system/server/packages.nix
 
     ../../components
diff --git a/nixos/machines/robi/media-syncthing.nix b/nixos/machines/robi/media-syncthing.nix
index 446b7a9..cd55902 100644
--- a/nixos/machines/robi/media-syncthing.nix
+++ b/nixos/machines/robi/media-syncthing.nix
@@ -1,7 +1,5 @@
 { config, pkgs, lib, ... }: {
 
-  # imports = [ ../../system/all/syncthing.nix ];
-
   sops.secrets.syncthing_cert = { };
   sops.secrets.syncthing_key = { };
 
diff --git a/nixos/machines/sterni/configuration.nix b/nixos/machines/sterni/configuration.nix
index 4dbc9f0..823703c 100644
--- a/nixos/machines/sterni/configuration.nix
+++ b/nixos/machines/sterni/configuration.nix
@@ -4,7 +4,6 @@
 
     ../../components
     ../../system/desktop
-    #../../system/server/netdata.nix
 
     ./hardware-configuration.nix
     ./packages.nix
diff --git a/nixos/system/proxy/default.nix b/nixos/system/proxy/default.nix
index 07a59cf..223c52e 100644
--- a/nixos/system/proxy/default.nix
+++ b/nixos/system/proxy/default.nix
@@ -2,7 +2,6 @@
 
   imports = [
     ../../system/all
-    #../../system/server/netdata.nix
     ../../system/server/graylog-exporter.nix
     ../../system/server/prometheus-exporters.nix
   ];