diff --git a/core/core-completion.el b/core/core-completion.el
index dfa5d1dbc..c2567106f 100644
--- a/core/core-completion.el
+++ b/core/core-completion.el
@@ -1,9 +1,6 @@
 ;;; core-completion.el --- auto completion backend (Company-mode)
 
 (use-package company
-  :commands (global-company-mode company-complete company-complete-common company-dict
-             company-files company-tags company-ispell company-yasnippet
-             company-semantic company-dabbrev-code company-manual-begin)
   :init
   (setq company-idle-delay nil
         company-minimum-prefix-length 2
@@ -24,14 +21,9 @@
         company-quickhelp-delay nil)
 
   :config
-  (use-package company-statistics)
-
   ;; NOTE: pos-tip.el in Emacs 25+ does not work
-  (use-package company-quickhelp :config (company-quickhelp-mode +1))
-
-  (use-package company-dict :defer t
-    :config
-    (setq company-dict-dir (concat narf-private-dir "dict")))
+  (use-package company-quickhelp
+    :config (company-quickhelp-mode +1))
 
   ;; Rewrites evil-complete to use company-dabbrev
   (setq evil-complete-next-func      'narf/company-evil-complete-next
@@ -46,7 +38,12 @@
   (define-key company-active-map "\C-w" nil)
 
   (global-company-mode +1)
+
+  (require 'company-statistics)
   (company-statistics-mode +1))
 
+(use-package company-dict :defer t
+  :config (setq company-dict-dir (concat narf-private-dir "/dict")))
+
 (provide 'core-completion)
 ;;; core-completion.el ends here