diff --git a/default.nix b/default.nix
index 6bd499c..021829a 100644
--- a/default.nix
+++ b/default.nix
@@ -676,8 +676,8 @@ in
     };
 
     acmeCertificateName = mkOption {
-      type = types.str;
-      default = cfg.fqdn;
+      type = with types; nullOr str;
+      default = cfg.fqdn or null;
       example = "example.com";
       description = ''
           ({option}`mailserver.certificateScheme` == `acme`)
diff --git a/flake.nix b/flake.nix
index 4a8b52d..acc6977 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,7 +14,7 @@
     };
   };
 
-  outputs = { self, utils, blobs, nixpkgs, ... }: let
+  outputs = { self, blobs, nixpkgs, ... }: let
     lib = nixpkgs.lib;
     system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages.${system};
diff --git a/mail-server/assertions.nix b/mail-server/assertions.nix
index 0e5b15b..4aae01c 100644
--- a/mail-server/assertions.nix
+++ b/mail-server/assertions.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, ... }:
 {
   assertions = lib.optionals config.mailserver.ldap.enable [
     {
diff --git a/mail-server/clamav.nix b/mail-server/clamav.nix
index 25418f0..0dafd4f 100644
--- a/mail-server/clamav.nix
+++ b/mail-server/clamav.nix
@@ -14,7 +14,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ config, pkgs, lib, options, ... }:
+{ config, lib, ... }:
 
 let
   cfg = config.mailserver;
diff --git a/mail-server/dovecot.nix b/mail-server/dovecot.nix
index a6251fd..e5d4b5c 100644
--- a/mail-server/dovecot.nix
+++ b/mail-server/dovecot.nix
@@ -39,27 +39,6 @@ let
       );
 
   postfixCfg = config.services.postfix;
-  dovecot2Cfg = config.services.dovecot2;
-
-  stateDir = "/var/lib/dovecot";
-
-  pipeBin = pkgs.stdenv.mkDerivation {
-    name = "pipe_bin";
-    src = ./dovecot/pipe_bin;
-    buildInputs = with pkgs; [ makeWrapper coreutils bash rspamd ];
-    buildCommand = ''
-      mkdir -p $out/pipe/bin
-      cp $src/* $out/pipe/bin/
-      chmod a+x $out/pipe/bin/*
-      patchShebangs $out/pipe/bin
-
-      for file in $out/pipe/bin/*; do
-        wrapProgram $file \
-          --set PATH "${pkgs.coreutils}/bin:${pkgs.rspamd}/bin"
-      done
-    '';
-  };
-
 
   ldapConfig = pkgs.writeTextFile {
     name = "dovecot-ldap.conf.ext.template";
diff --git a/mail-server/kresd.nix b/mail-server/kresd.nix
index e3baa07..230bdea 100644
--- a/mail-server/kresd.nix
+++ b/mail-server/kresd.nix
@@ -14,7 +14,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 let
   cfg = config.mailserver;
diff --git a/mail-server/monit.nix b/mail-server/monit.nix
index c69b19e..c3f8760 100644
--- a/mail-server/monit.nix
+++ b/mail-server/monit.nix
@@ -14,7 +14,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 let
   cfg = config.mailserver;
diff --git a/mail-server/nginx.nix b/mail-server/nginx.nix
index a037f56..98291ca 100644
--- a/mail-server/nginx.nix
+++ b/mail-server/nginx.nix
@@ -15,9 +15,7 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
 
-{ config, pkgs, lib, ... }:
-
-with (import ./common.nix { inherit config lib pkgs; });
+{ config, lib, ... }:
 
 let
   cfg = config.mailserver;
diff --git a/mail-server/postfix.nix b/mail-server/postfix.nix
index 351da81..355dd31 100644
--- a/mail-server/postfix.nix
+++ b/mail-server/postfix.nix
@@ -123,9 +123,6 @@ let
      /^Message-ID:\s+<(.*?)@.*?>/ REPLACE Message-ID: <$1@${cfg.fqdn}>
   '');
 
-  inetSocket = addr: port: "inet:[${toString port}@${addr}]";
-  unixSocket = sock: "unix:${sock}";
-
   smtpdMilters =
    (lib.optional cfg.dkimSigning "unix:/run/opendkim/opendkim.sock")
    ++ [ "unix:/run/rspamd/rspamd-milter.sock" ];