diff --git a/hosts/Haven/default.nix b/hosts/Haven/default.nix
index 788a0f4..e68ea6a 100644
--- a/hosts/Haven/default.nix
+++ b/hosts/Haven/default.nix
@@ -16,6 +16,15 @@ let
     config.secrets.services.forgejo.url
     config.secrets.services.gremlin-lab.url
   ];
+
+  namecheapCredentials = {
+    "NAMECHEAP_API_USER_FILE" = "${pkgs.writeText "namecheap-api-user" ''
+      ${config.secrets.networking.namecheap.api.user}
+    ''}";
+    "NAMECHEAP_API_KEY_FILE" = "${pkgs.writeText "namecheap-api-key" ''
+      ${config.secrets.networking.namecheap.api.key}
+    ''}";
+  };
 in
 {
   imports = [ ./hardware-configuration.nix ];
@@ -53,26 +62,12 @@ in
             dnsProvider = "namecheap";
             extraDomainNames = subdomains;
             webroot = null; # Required in order to prevent a failed assertion
-            credentialFiles = {
-              "NAMECHEAP_API_USER_FILE" = "${pkgs.writeText "namecheap-api-user" ''
-                ${config.secrets.networking.namecheap.api.user}
-              ''}";
-              "NAMECHEAP_API_KEY_FILE" = "${pkgs.writeText "namecheap-api-key" ''
-                ${config.secrets.networking.namecheap.api.key}
-              ''}";
-            };
+            credentialFiles = namecheapCredentials;
           };
           "${config.secrets.networking.blogDomain}" = {
             dnsProvider = "namecheap";
             webroot = null; # Required in order to prevent a failed assertion
-            credentialFiles = {
-              "NAMECHEAP_API_USER_FILE" = "${pkgs.writeText "namecheap-api-user" ''
-                ${config.secrets.networking.namecheap.api.user}
-              ''}";
-              "NAMECHEAP_API_KEY_FILE" = "${pkgs.writeText "namecheap-api-key" ''
-                ${config.secrets.networking.namecheap.api.key}
-              ''}";
-            };
+            credentialFiles = namecheapCredentials;
           };
         };
       };
diff --git a/hosts/Khanda/default.nix b/hosts/Khanda/default.nix
index 516fac2..f4ede9f 100644
--- a/hosts/Khanda/default.nix
+++ b/hosts/Khanda/default.nix
@@ -32,10 +32,7 @@ in
       office.enable = true;
       recording.enable = true;
       social.enable = true;
-      writing = {
-        enable = true;
-        languagetool.enable = false;
-      };
+      writing.enable = true;
     };
 
     # Enable Secure Boot support.
@@ -93,10 +90,4 @@ in
 
   # Limit the number of cores Nix can use
   nix.settings.cores = 10;
-
-  # Configure the virtual machine created by nixos-rebuild build-vm
-  virtualisation.vmVariant.virtualisation = {
-    memorySize = 2048;
-    cores = 2;
-  };
 }