diff --git a/core/core-helm.el b/core/core-helm.el
index 4062a796b..ae2a42425 100644
--- a/core/core-helm.el
+++ b/core/core-helm.el
@@ -6,7 +6,6 @@
              helm-show-kill-ring
              helm-bookmarks
              helm-wg
-             helm-ag
              helm-alive-p
              helm-attrset)
   :init
@@ -66,7 +65,9 @@
              helm-org-capture-templates))
 
 (use-package helm-files
-  :commands helm-recentf
+  :commands (helm-recentf
+             helm-buffers
+             helm-buffers-list)
   :config
   (defun helm-recentf ()
     "Reconfigured `helm-recentf' to use `helm', instead of `helm-other-buffer'"
@@ -129,7 +130,6 @@
   (require 'projectile))
 
 ;; (use-package helm-c-yasnippet :commands helm-yas-visit-snippet-file)
-(use-package helm-buffers     :commands helm-buffers-list)
 (use-package helm-semantic    :commands helm-semantic-or-imenu)
 (use-package helm-elisp       :commands helm-apropos)
 (use-package helm-command     :commands helm-M-x)
diff --git a/core/core-ui.el b/core/core-ui.el
index 3e8c7e5b8..6f09a515a 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -95,9 +95,6 @@
     (remove-hook 'post-command-hook 'narf|nlinum-hl-line)
     (narf|nlinum-unhl-line))
 
-  (add-hook! text-mode 'narf|nlinum-enable)
-  (add-hook! prog-mode 'narf|nlinum-enable)
-  (add-hook! org-mode  'narf|nlinum-disable)
   ;; Preset width nlinum
   (add-hook! nlinum-mode
     (setq nlinum--width (length (number-to-string (count-lines (point-min) (point-max)))))))