diff --git a/modules/services/server/matrix.nix b/modules/services/server/matrix.nix
index 64e655f..70253a9 100644
--- a/modules/services/server/matrix.nix
+++ b/modules/services/server/matrix.nix
@@ -43,21 +43,9 @@ in {
           return 404;
         '';
       };
-      #      "element.${config.networking.domain}" = {
-      #        enableACME = true;
-      #        forceSSL = true;
-      #
-      #        root = pkgs.element-web.override {
-      #            conf = {
-      #                default_server_config = clientConfig;
-      #            };
-      #        };
-      #      };
     };
   };
 
-  imports = [../../kabbone/mautrix-whatsapp.nix];
-
   services.matrix-synapse = {
     enable = true;
     settings = {
@@ -200,7 +188,7 @@ in {
         };
       };
     };
-    kabbone_mautrix-whatsapp = {
+    mautrix-whatsapp = {
       enable = true;
       registerToSynapse = true;
       environmentFile = config.age.secrets."services/matrix/mautrix-whatsapp.env".path;