diff --git a/core/core-evil.el b/core/core-evil.el
index 3b4775112..9ee5a50f5 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -59,8 +59,9 @@
     (evil-set-initial-state `,(car mode-map) `,(cdr mode-map)))
 
   ;; Switch to normal mode before switching windows
-  (defun narf*evil-back-to-normal () (evil-normal-state))
-  (advice-add 'select-window :before 'narf*evil-back-to-normal)
+  (defun narf|evil-back-to-normal (&rest _)
+    (when (eq evil-state 'insert) (evil-normal-state)))
+  (add-hook! narf.window-switch 'narf|evil-back-to-normal)
 
   (progn ; evil hacks
     (defadvice evil-force-normal-state (after evil-esc-quit activate)
diff --git a/core/core-helm.el b/core/core-helm.el
index 64a195721..627130eb1 100644
--- a/core/core-helm.el
+++ b/core/core-helm.el
@@ -149,7 +149,5 @@
 (use-package helm-command  :commands helm-M-x)
 (use-package helm-descbinds :commands helm-descbinds)
 
-(use-package helm-deft :defer t)
-
 (provide 'core-helm)
 ;;; core-helm.el ends here
diff --git a/core/core-ui.el b/core/core-ui.el
index fe6f740a6..de5a3de3f 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -146,7 +146,7 @@
   :preface
   (defvar narf--hl-nlinum-overlay nil)
   (defvar narf--hl-nlinum-line nil)
-  (defvar nlinum-format " %4d  ")
+  (defvar nlinum-format " %4d ")
   (defface linum-highlight-face '((t (:inherit linum))) "Face for line highlights")
   (setq linum-format "%3d ")
   :init
diff --git a/modules/module-org.el b/modules/module-org.el
index 92d59b18f..302826b51 100644
--- a/modules/module-org.el
+++ b/modules/module-org.el
@@ -209,8 +209,6 @@ will function properly."
   (defface org-headline-todo '((t ())) "Face for todo headlines")
   (defface org-todo-high '((t ())) "Face for high-priority todo")
   (defface org-todo-vhigh '((t ())) "Face for very high-priority todo")
-  ;; (defface org-item-checkbox '((t ())) "Face for checkbox list lines")
-  ;; (defface org-item-checkbox-checked '((t ())) "Face for checked checkbox list lines")
   (defface org-whitespace '((t ())) "Face for spaces")
   (defface org-list-bullet '((t ())) "Face for list bullets")
   (font-lock-add-keywords
diff --git a/private/my-bindings.el b/private/my-bindings.el
index 1f2e1ad51..0eecce7d9 100644
--- a/private/my-bindings.el
+++ b/private/my-bindings.el
@@ -74,17 +74,13 @@
    :ni "M-d"  'dash-at-point
 
    ;; Add animated transitions to OSX emacs
-   "M-w"   (λ (if window-system
-                  (mac-start-animation (get-buffer-window) :type 'fade-out :duration 0.25))
-              (call-interactively 'evil-window-delete))
+   "M-w"   'evil-window-delete
    "M-W"   (λ (let ((data (assq (selected-frame) narf-wg-frames)))
                 (if data
                     (progn (wg-delete-workgroup (wg-get-workgroup (cdr data)))
                            (delete-frame (car data)))
                   (delete-frame))))
-   "M-n"   (λ (if window-system
-                  (mac-start-animation (get-buffer-window) :type 'fade-out :duration 0.25))
-              (switch-to-buffer (generate-new-buffer "*new*")))
+   "M-n"   (λ (switch-to-buffer (generate-new-buffer "*new*")))
 
    ;; Textmate-esque indent shift left/right
    :i "M-["           (kbd "C-o m l C-o I DEL C-o ` l")