diff --git a/core/core-evil.el b/core/core-evil.el
index 9b9f9efbf..a08859095 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -74,11 +74,6 @@
                       ))
     (evil-set-initial-state `,(car mode-map) `,(cdr mode-map)))
 
-  ;; Switch to normal mode before switching windows
-  (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)
       "Close popups, disable search highlights and quit the minibuffer if open."
diff --git a/core/core.el b/core/core.el
index 104f95d1d..76825a154 100644
--- a/core/core.el
+++ b/core/core.el
@@ -129,17 +129,6 @@
              async-wait
              async-inject-variables))
 
-;; Custom Hooks ;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defvar narf.window-switch-hook '()
-  "Hooks run before switching windows. Hooks take two arguments (one is
-optional): WINDOW and NORECORD. WINDOW is the window being switched to. Use
-`current-buffer' to get the buffer being switched from. See `select-window' for
-details on NORECORD.")
-(defun narf*run-window-switch-hooks (window &optional norecord)
-  (run-hook-with-args 'narf.window-switch-hook window norecord))
-(advice-add 'select-window :before 'narf*run-window-switch-hooks)
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defun narf-init ()