diff --git a/modules/lang/json/config.el b/modules/lang/json/config.el
index a2d385c56..88d6889b4 100644
--- a/modules/lang/json/config.el
+++ b/modules/lang/json/config.el
@@ -27,9 +27,6 @@
   :init
   (set-tree-sitter! 'json-mode 'json-ts-mode 'json)
   :config
-  ;; HACK: Rely on `major-mode-remap-defaults'.
-  (cl-callf2 assq-delete-all 'json-ts-mode auto-mode-alist)
-
   (when (modulep! +lsp)
     (add-hook 'json-ts-mode-local-vars-hook #'lsp! 'append)))
 
diff --git a/modules/lang/lua/config.el b/modules/lang/lua/config.el
index e57d8a150..bd5e4d3fc 100644
--- a/modules/lang/lua/config.el
+++ b/modules/lang/lua/config.el
@@ -40,11 +40,7 @@
   (when (modulep! +lsp)
     (add-hook 'lua-ts-mode-local-vars-hook #'lsp! 'append)
     (when (modulep! :tools lsp +eglot)
-      (set-eglot-client! 'lua-ts-mode (+lua-generate-lsp-server-command))))
-
-  ;; HACK: Get rid of redundancies, rely on `major-mode-remap-defaults'
-  (cl-callf2 delete '("\\.lua\\'" . lua-ts-mode) auto-mode-alist)
-  (cl-callf2 delete '("\\<lua\\(?:jit\\)?" . lua-ts-mode) interpreter-mode-alist))
+      (set-eglot-client! 'lua-ts-mode (+lua-generate-lsp-server-command)))))
 
 
 (use-package! moonscript
diff --git a/modules/lang/markdown/config.el b/modules/lang/markdown/config.el
index 9fea6ecad..f1e5dde26 100644
--- a/modules/lang/markdown/config.el
+++ b/modules/lang/markdown/config.el
@@ -131,9 +131,7 @@ capture, the end position, and the output buffer.")
   :when (fboundp 'markdown-ts-mode)
   :defer t
   :init
-  (set-tree-sitter! 'markdown-mode 'markdown-ts-mode '(markdown markdown-inline))
-  :config
-  (cl-callf2 delete '("\\.md\\'" . markdown-ts-mode) auto-mode-alist))
+  (set-tree-sitter! 'markdown-mode 'markdown-ts-mode '(markdown markdown-inline)))
 
 
 (use-package! evil-markdown
diff --git a/modules/lang/scala/config.el b/modules/lang/scala/config.el
index 80a9ed0f0..099cca00e 100644
--- a/modules/lang/scala/config.el
+++ b/modules/lang/scala/config.el
@@ -68,9 +68,6 @@
     (setq-hook! 'scala-ts-mode-hook lsp-enable-indentation nil)
     (add-hook 'scala-ts-mode-local-vars-hook #'lsp! 'append))
 
-  ;; HACK: Rely on `major-mode-remap-defaults'.
-  (cl-callf2 assq-delete-all 'scala-ts-mode auto-mode-alist)
-
   (+scala-common-config 'scala-ts-mode))