@@ -89,7 +89,7 @@
 ;;;; Style
 
 (use-package linum
-  :commands (linum-mode)
+  :defer t
   :config (setq linum-format " %4d "))
 
 (use-package highlight-symbol
@@ -234,7 +234,6 @@ ;;;; Buffers
 
 (use-package ibuffer
   :disabled t
-  :commands (ibuffer)
   :config (progn
             (setq ibuffer-saved-filter-groups
                   (quote (("default"
@@ -311,8 +310,7 @@ (setq completion-styles '(basic initials partial-completion substring)
       completion-ignore-case t)
 
 (use-package smart-tab
-  :commands (global-smart-tab-mode)
-  :idle (global-smart-tab-mode)
+  :init (global-smart-tab-mode)
   :config (progn
             (nconc smart-tab-completion-functions-alist '((php-mode . php-complete-function)))
             (diminish 'smart-tab-mode "")))
@@ -345,12 +343,7 @@ (add-to-list 'Info-default-directory-list
              (concat user-emacs-directory
                      "info"))
 
-(use-package eldoc
-  :commands (turn-on-eldoc-mode
-             eldoc-add-command))
-
 (use-package eldoc-context
-  :depends eldoc
   :bind (("C-c h" . rgr/toggle-context-help)))
 
 (use-package help+
@@ -510,8 +503,6 @@ :bind (("C-x i"   . helm-imenu)
          ("C-x C-b" . helm-mini)))
 
 (use-package ido
-  :commands (ido-mode
-             ido-find-file)
   :init (bind-key* "C-x C-f" #'ido-find-file)
   :bind (("C-x b"   . ido-switch-buffer))
   :config (progn