diff --git a/behaviour.el b/behaviour.el
index 516b0de..a5bfde1 100644
--- a/behaviour.el
+++ b/behaviour.el
@@ -7,10 +7,6 @@
       (if (equal (buffer-name) "*dashboard*") nil (kill-buffer))
       (evil-window-delete)))
 
-;; Treemacs directory expansion
-(with-eval-after-load 'treemacs
-  (define-key treemacs-mode-map [mouse-1] #'treemacs-single-click-expand-action))
-
 ;; Save backup files to a single dir
 (setq backup-directory-alist
 	`((".*" . ,temporary-file-directory)))
diff --git a/binds.el b/binds.el
index 74a8d00..8ed294d 100644
--- a/binds.el
+++ b/binds.el
@@ -13,11 +13,8 @@
 (require 'evil)
 (require 'evil-surround)
 (require 'evil-commentary)
-(require 'evil-leader)
-(global-evil-leader-mode 1)
 (evil-mode 1)
 (evil-commentary-mode 1)
-(global-undo-tree-mode 1)
 (evil-set-initial-state 'Custom-mode 'normal)
 (evil-set-initial-state 'vterm-mode 'insert)
 
diff --git a/init.el b/init.el
index 42f27f6..feb1e06 100644
--- a/init.el
+++ b/init.el
@@ -187,7 +187,7 @@
  '(display-time-default-load-average nil)
  '(display-time-interval 15)
  '(display-time-mode t)
- '(evil-undo-system 'undo-tree)
+ '(evil-undo-system 'undo-fu)
  '(haskell-emacs-build-tool 'stack)
  '(haskell-interactive-popup-errors nil)
  '(haskell-process-args-ghci '("-ignore-dot-ghci" "-ferror-spans"))