diff --git a/machines/CDServer/configuration.nix b/machines/CDServer/configuration.nix
deleted file mode 100644
index f882f61..0000000
--- a/machines/CDServer/configuration.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{
-  system.autoUpgrade.enable = false;
-  services.haveged.enable = true;
-
-  # This value determines the NixOS release with which your system is to be
-  # compatible, in order to avoid breaking some software such as database
-  # servers. You should change this only after NixOS release notes say you
-  # should.
-  system.stateVersion = "19.03";
-}
diff --git a/machines/CDServer/options.nix b/machines/CDServer/options.nix
deleted file mode 100644
index 0242e34..0000000
--- a/machines/CDServer/options.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.machine;
-in {
-  imports = [
-    ../../options/mailman3/options.nix
-  ];
-
-  config.machine = rec {
-    hostName = "CDServer";
-    domain = "countdown-dresden.de";
-    extraDomains = [ "iz-ev.de" "clubduererstrasse.de" ];
-    administrators = [
-      { name = "kevin"; id = 1337; }
-      { name = "reinhold"; id= 1000; }
-    ];
-    mailAccounts = import "${cfg.secretPath}/mailAccounts.nix";
-    allowUnfree = false;
-    conffiles = [
-      "etcvars"
-      "security"
-      "zsh"
-    ];
-    pkgs = [
-      "base"
-      "server"
-    ];
-    services = [
-      "fail2ban"
-      "gitea"
-      "mailserver"
-      "mariaDB"
-      "nextcloud"
-      "nginx"
-      "openssh"
-#      "cd-internes"
-#      "docker"
-    ];
-    vHosts = (flatten (map (base: [
-      { domain = base; service = "simple"; }
-      { domain = "storage.${base}"; service = "nextcloud"; }
-      { domain = "mail.${base}"; service = "mail"; }
-      { domain = "git.${base}"; service = "gitea"; }
-    ]) ([ domain ] ++ extraDomains)));
-    firewall = {
-      enable = true;
-      allowPing = false;
-      allowedUDPPorts = [ 22 80 443 ];
-      allowedTCPPorts = [ 80 443 ];
-    };
-  };
-  config.services.mailman3 = {
-    enable = true;
-    site_owner = "derped@ophanim.de";
-    database = {
-      type = "mysql";
-      name = "mailman3";
-      user = "mailman3";
-      host = "localhost";
-      port = 3306;
-      passwordFile = "${cfg.secretPath}/mailman3_db";
-    };
-    mta = {
-      lmtp_host = "mail.ophanim.de";
-      smtp_host = "mail.ophanim.de";
-      smtp_user = "mailman3";
-      smtp_passFile = "${cfg.secretPath}/mailman3_mail";
-    };
-  };
-}
diff --git a/machines/Ophanim/options.nix b/machines/Ophanim/options.nix
index 62c61e4..882d958 100644
--- a/machines/Ophanim/options.nix
+++ b/machines/Ophanim/options.nix
@@ -5,15 +5,11 @@ with lib;
 let
   cfg = config.machine;
 in {
-  imports = [
-    ../../options/mailman3/options.nix
-  ];
-
   config.machine = rec {
     hostName = "Ophanim";
     domain = "ophanim.de";
     administrators = [ { name = "derped"; id = 1337; } ];
-    mailAccounts = [ { name = "derped"; aliases = [ "postmaster" "baensch" ]; } { name = "mailman3"; aliases = []; } ];
+    mailAccounts = [ { name = "derped"; aliases = [ "postmaster" "baensch" ]; } ];
     allowUnfree = true;
     conffiles = [
       "etcvars"
@@ -49,22 +45,4 @@ in {
       allowedTCPPorts = [ 80 443 ];
     };
   };
-  config.services.mailman3 = {
-    enable = false;
-    site_owner = "derped@ophanim.de";
-    database = {
-      type = "mysql";
-      name = "mailman3";
-      user = "mailman3";
-      host = "localhost";
-      port = 3306;
-      passwordFile = "${cfg.secretPath}/mailman3_db";
-    };
-    mta = {
-      lmtp_host = "mail.ophanim.de";
-      smtp_host = "mail.ophanim.de";
-      smtp_user = "mailman3";
-      smtp_passFile = "${cfg.secretPath}/mailman3_mail";
-    };
-  };
 }