diff --git a/core/core-editor.el b/core/core-editor.el
index 721b0c166..ca0cbf3ba 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -188,8 +188,10 @@ enable multiple minor modes for the same regexp.")
   (dumb-jump-mode +1))
 
 (use-package emr
-  :commands (emr-initialize emr-show-refactor-menu emr-declare-command)
-  :config (define-key popup-menu-keymap [escape] 'keyboard-quit))
+  :commands (emr-show-refactor-menu emr-declare-command)
+  :config
+  (emr-initialize)
+  (define-key popup-menu-keymap [escape] 'keyboard-quit))
 
 (use-package expand-region
   :commands (er/expand-region er/contract-region er/mark-symbol er/mark-word))
diff --git a/modules/module-csharp.el b/modules/module-csharp.el
index 871136871..c574f3e37 100644
--- a/modules/module-csharp.el
+++ b/modules/module-csharp.el
@@ -12,8 +12,7 @@
   (setq omnisharp-auto-complete-want-documentation nil
         omnisharp-server-executable-path (concat narf-ext-dir "/OmniSharp.exe"))
   :when (file-exists-p omnisharp-server-executable-path)
-  :init
-  (add-hook! csharp-mode '(turn-on-eldoc-mode emr-initialize omnisharp-mode))
+  :init (add-hook! csharp-mode '(turn-on-eldoc-mode omnisharp-mode))
   :config
   (def-company-backend! csharp-mode (omnisharp))
   (map! :map omnisharp-mode-map
diff --git a/modules/module-go.el b/modules/module-go.el
index 24c0fb332..4d13c9105 100644
--- a/modules/module-go.el
+++ b/modules/module-go.el
@@ -4,7 +4,7 @@
   :mode "\\.go$"
   :interpreter "go"
   :init
-  (add-hook! go-mode '(emr-initialize flycheck-mode go-eldoc-setup))
+  (add-hook 'go-mode-hook 'flycheck-mode)
   (add-hook! go-mode (add-hook 'before-save-hook 'gofmt-before-save))
   :config
   (def-builder! go-mode "go build")
@@ -33,7 +33,8 @@
         '((go-remove-unused-imports "Remove unushed imports" nil)
           (gofmt                    "Format code" nil))))
 
-(use-package go-eldoc :after go-mode)
+(use-package go-eldoc :after go-mode
+  :init (add-hook 'go-mode-hook 'go-eldoc-setup))
 
 (use-package company-go :after go-mode)
 
diff --git a/modules/module-js.el b/modules/module-js.el
index 5a1b0a826..9287d5876 100644
--- a/modules/module-js.el
+++ b/modules/module-js.el
@@ -3,9 +3,7 @@
 (use-package js2-mode
   :mode "\\.js$"
   :interpreter "node"
-  :init
-  (add-hook! js2-mode '(tern-mode emr-initialize))
-
+  :init (add-hook 'js2-mode-hook 'tern-mode)
   :config
   (def-repl! js2-mode nodejs-repl)
   (def-docset! js2-mode "js,javascript,nodejs,angularjs,express,jquery,mongoose")
diff --git a/modules/module-php.el b/modules/module-php.el
index b9a077327..a2084ddb2 100644
--- a/modules/module-php.el
+++ b/modules/module-php.el
@@ -52,7 +52,7 @@
 
 (use-package php-refactor-mode
   :after php-mode
-  :init (add-hook! php-mode '(turn-on-eldoc-mode emr-initialize php-refactor-mode))
+  :init (add-hook! php-mode '(turn-on-eldoc-mode php-refactor-mode))
   :config
   (mapc (lambda (x)
           (let ((command-name (car x))
diff --git a/modules/module-python.el b/modules/module-python.el
index ced553b05..ca8f726a1 100644
--- a/modules/module-python.el
+++ b/modules/module-python.el
@@ -42,7 +42,6 @@
 
 (use-package company-anaconda
   :after anaconda-mode
-  :init (add-hook 'anaconda-mode-hook 'emr-initialize)
   :config
   (mapc (lambda (x)
           (let ((command-name (car x))
diff --git a/modules/module-ruby.el b/modules/module-ruby.el
index ef6f5c5b0..1ab5439a0 100644
--- a/modules/module-ruby.el
+++ b/modules/module-ruby.el
@@ -20,7 +20,6 @@
 
 (use-package ruby-refactor
   :after ruby-mode
-  :init (add-hook 'ruby-mode-hook 'emr-initialize)
   :config
   (mapc (lambda (x)
           (let ((command-name (car x))