diff --git a/module.nix b/module.nix
index 8f9c355..fb62f7c 100644
--- a/module.nix
+++ b/module.nix
@@ -6,7 +6,7 @@ with lib;
 let
   user-configs = {
     niten = ./niten.nix;
-    root = ./niten.nix;
+    root = ./root.nix;
     viator = ./niten.nix;
     xiaoxuan = ./xiaoxuan.nix;
   };
@@ -14,14 +14,6 @@ let
   hostname = config.instance.hostname;
   enable-gui = config.fudo.hosts.${hostname}.enable-gui;
 
-  user-config-map = {
-    niten = ./niten.nix;
-    # FIXME: Root shouldn't have all this stuff installed!
-    root = ./root.nix;
-    viator = ./niten.nix;
-    xiaoxuan = ./xiaoxuan.nix;
-  };
-
   local-users = let
     local-usernames = attrNames config.instance.local-users;
   in filterAttrs
diff --git a/niten.nix b/niten.nix
index 858a45d..286cc67 100644
--- a/niten.nix
+++ b/niten.nix
@@ -170,35 +170,6 @@ in {
     };
   };
 
-  accounts.email.accounts = {
-    Fudo = {
-      primary = true;
-      address = "niten@fudo.org";
-      aliases = [ "peter@selby.ca" ];
-      userName = "niten";
-      realName = "Niten";
-      imap = {
-        host = "mail.fudo.org";
-        port = 993;
-        tls.enable = true;
-      };
-      smtp = {
-        host = "mail.fudo.org";
-        port = 587;
-        tls = {
-          enable = true;
-          useStartTls = true;
-        };
-      };
-    };
-
-    GMail = {
-      address = "pselby@gmail.com";
-      flavor = "gmail.com";
-      realName = "Peter Selby";
-    };
-  };
-
   home = {
     packages = if enable-gui then (common-packages ++ gui-packages)
                else
@@ -243,5 +214,5 @@ in {
   };
 
   systemd.user.tmpfiles.rules =
-    map (dir: "d ${home-dir}/${dir} 700 niten - - -") ensure-directories;
+    map (dir: "d ${home-dir}/${dir} 700 ${username} - - -") ensure-directories;
 }