diff --git a/core/core-company.el b/core/core-company.el
index 0de005b42..971e9b74d 100644
--- a/core/core-company.el
+++ b/core/core-company.el
@@ -38,7 +38,6 @@
 
   ;; Rewrite evil-complete to use company-dabbrev
   (setq company-dabbrev-code-other-buffers t
-        company-dabbrev-code-buffers       nil
         evil-complete-next-func           'narf/company-evil-complete-next
         evil-complete-previous-func       'narf/company-evil-complete-previous)
 
diff --git a/core/core-evil.el b/core/core-evil.el
index 4f934fb70..79148bd75 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -143,22 +143,7 @@ See `https://bitbucket.org/lyro/evil/issue/527'"
 
 (use-package evil-snipe
   :diminish evil-snipe-mode
-  :commands (evil-snipe-s evil-snipe-S
-             evil-snipe-x evil-snipe-X
-             evil-snipe-f evil-snipe-F
-             evil-snipe-t evil-snipe-T
-             evil-snipe-repeat evil-snipe-repeat-reverse)
   :init
-  (bind! :m "s" 'evil-snipe-s
-         :m "S" 'evil-snipe-S
-         :m "f" 'evil-snipe-f
-         :m "F" 'evil-snipe-F
-         :m "t" 'evil-snipe-t
-         :m "T" 'evil-snipe-T
-         :o "z" 'evil-snipe-s
-         :o "Z" 'evil-snipe-S
-         :o "x" 'evil-snipe-x
-         :o "X" 'evil-snipe-X)
   (define-key evil-normal-state-map "s" nil)
   (define-key evil-normal-state-map "S" nil)
   :config
diff --git a/core/core-helm.el b/core/core-helm.el
index 02a62a818..4062a796b 100644
--- a/core/core-helm.el
+++ b/core/core-helm.el
@@ -23,7 +23,6 @@
         helm-split-window-preferred-function 'narf/helm-split-window)
   :config
   (require 'helm-ag)
-  (require 'helm-grep)
 
   (evil-set-initial-state 'helm-mode 'emacs)
 
@@ -49,6 +48,18 @@
 
   (advice-add 'helm-display-mode-line :override 'narf*helm-hide-modeline))
 
+(use-package helm-ag
+  :commands (helm-ag
+             helm-ag-mode
+             helm-do-ag
+             helm-do-ag-this-file
+             helm-do-ag-project-root
+             helm-do-ag-buffers
+             helm-ag-project-root
+             helm-ag-pop-stack
+             helm-ag-buffers
+             helm-ag-clear-stack))
+
 (use-package helm-org
   :commands (helm-org-in-buffer-headings
              helm-org-agenda-files-headings
diff --git a/core/core-quickrun.el b/core/core-quickrun.el
index 4c4a97eea..798c82a1d 100644
--- a/core/core-quickrun.el
+++ b/core/core-quickrun.el
@@ -7,7 +7,10 @@
              quickrun-shell
              quickrun-compile-only
              quickrun-replace-region
-             helm-quickrun))
+             helm-quickrun)
+  :config
+  (add-popwin-rule! "*quickrun*" :position bottom :height 15)
+  (add-unreal-buffer! "\\`\\*quickrun\\*\\'"))
 
 (provide 'core-quickrun)
 ;;; core-quickrun.el ends here