diff --git a/ansible/roles/emacs/files/lang-rust.el b/ansible/roles/emacs/files/lang-rust.el
index b2e29eb..ffcc0f4 100644
--- a/ansible/roles/emacs/files/lang-rust.el
+++ b/ansible/roles/emacs/files/lang-rust.el
@@ -24,8 +24,6 @@
     )
   )
 
-(add-to-list 'major-mode-remap-alist '(rust-mode . rust-ts-mode))
-
 (use-package rust-mode
   :pin nongnu
   :mode "\\.rs\\'"
@@ -43,6 +41,8 @@
                         (add-hook 'before-save-hook 'eglot-format-buffer nil 'local)
                         ))
          )
+  :init
+  (add-to-list 'major-mode-remap-alist '(rust-mode . rust-ts-mode))
   :config
   (treesit-install-language-grammar 'rust)
   ;; Add keybindings for interacting with Cargo
diff --git a/ansible/roles/emacs/files/lang-yaml.el b/ansible/roles/emacs/files/lang-yaml.el
index 25cea73..7eef88a 100644
--- a/ansible/roles/emacs/files/lang-yaml.el
+++ b/ansible/roles/emacs/files/lang-yaml.el
@@ -1,11 +1,11 @@
-(defun yaml-backspace (arg)
-  "Special handling of yaml backspace."
-  (interactive "*p")
-  (if mark-active
-      (backward-delete-char-untabify arg)
-    (yaml-electric-backspace arg)
-    )
-  )
+;; (defun yaml-backspace (arg)
+;;   "Special handling of yaml backspace."
+;;   (interactive "*p")
+;;   (if mark-active
+;;       (backward-delete-char-untabify arg)
+;;     (yaml-electric-backspace arg)
+;;     )
+;;   )
 
 (defun yaml-format-buffer ()
   "Run prettier."
@@ -27,9 +27,9 @@
                         (add-hook 'before-save-hook 'yaml-format-buffer nil 'local)
                         ))
          )
-  :bind (
-         (:map yaml-mode-map ([backspace] . yaml-backspace))
-         )
+  ;; :bind (
+  ;;        (:map yaml-mode-map ([backspace] . yaml-backspace))
+  ;;        )
   )
 
 (provide 'lang-yaml)