12 files changed, 11 insertions, 60 deletions
diff --git a/evil-collection-cider.el b/evil-collection-cider.el
index 0a8ca99..1052f45 100644
--- a/evil-collection-cider.el
+++ b/evil-collection-cider.el
@@ -28,7 +28,7 @@
 
 ;;; Code:
 (require 'cider nil t)
-(require 'evil-collection-util)
+(require 'evil)
 
 (defun evil-collection-cider-last-sexp (command &rest args)
   "In normal-state or motion-state, last sexp ends at point."
diff --git a/evil-collection-compile.el b/evil-collection-compile.el
index 87c12cc..82f7136 100644
--- a/evil-collection-compile.el
+++ b/evil-collection-compile.el
@@ -27,7 +27,7 @@
 ;; Evil bindings for `compile'.
 
 ;;; Code:
-(require 'evil-collection-util)
+(require 'evil)
 (require 'compile)
 
 (defun evil-collection-compile-setup ()
diff --git a/evil-collection-dired.el b/evil-collection-dired.el
index 9ff4153..871210d 100644
--- a/evil-collection-dired.el
+++ b/evil-collection-dired.el
@@ -28,7 +28,7 @@
 
 ;;; Code:
 (require 'dired)
-(require 'evil-collection-util)
+(require 'evil)
 
 (defun evil-collection-dired-setup ()
   "Set up `evil' bindings for `dired'."
diff --git a/evil-collection-elisp-refs.el b/evil-collection-elisp-refs.el
index 34f0e69..192fbfd 100644
--- a/evil-collection-elisp-refs.el
+++ b/evil-collection-elisp-refs.el
@@ -28,7 +28,7 @@
 ;; `evil-mode'.
 
 ;;; Code:
-(require 'evil-collection-util)
+(require 'evil)
 (require 'elisp-refs nil t)
 
 (defun evil-collection-elisp-refs-setup ()
diff --git a/evil-collection-flycheck.el b/evil-collection-flycheck.el
index e091a21..3fd1f11 100644
--- a/evil-collection-flycheck.el
+++ b/evil-collection-flycheck.el
@@ -27,7 +27,7 @@
 ;; Evil bindings for `flycheck-mode'.
 
 ;;; Code:
-(require 'evil-collection-util)
+(require 'evil)
 (require 'flycheck nil t)
 
 (defvar flycheck-error-list-mode-map)
diff --git a/evil-collection-ggtags.el b/evil-collection-ggtags.el
index cbe9ce3..19f6b7a 100644
--- a/evil-collection-ggtags.el
+++ b/evil-collection-ggtags.el
@@ -27,7 +27,7 @@
 ;; Evil bindings for `ggtags-mode'.
 
 ;;; Code:
-(require 'evil-collection-util)
+(require 'evil)
 (require 'ggtags nil t)
 
 (defvar ggtags-global-mode-map)
diff --git a/evil-collection-macrostep.el b/evil-collection-macrostep.el
index c34fac7..1ef78c1 100644
--- a/evil-collection-macrostep.el
+++ b/evil-collection-macrostep.el
@@ -27,7 +27,7 @@
 ;; Evil bindings for `macrostep-mode'.
 
 ;;; Code:
-(require 'evil-collection-util)
+(require 'evil)
 (require 'macrostep nil t)
 
 (defun evil-collection-macrostep-setup ()
diff --git a/evil-collection-occur.el b/evil-collection-occur.el
index 996d9c8..1c2b594 100644
--- a/evil-collection-occur.el
+++ b/evil-collection-occur.el
@@ -27,7 +27,7 @@
 ;; Evil bindings for `occur'.
 
 ;;; Code:
-(require 'evil-collection-util)
+(require 'evil)
 
 (when (> emacs-major-version 25)
   (require 'replace))
diff --git a/evil-collection-pass.el b/evil-collection-pass.el
index 9bf867f..43976cb 100644
--- a/evil-collection-pass.el
+++ b/evil-collection-pass.el
@@ -27,7 +27,7 @@
 ;; Evil bindings for `pass-mode'.
 
 ;;; Code:
-(require 'evil-collection-util)
+(require 'evil)
 (require 'pass nil t)
 
 (defvar pass-mode-map)
diff --git a/evil-collection-util.el b/evil-collection-util.el
deleted file mode 100644
index c823d4d..0000000
--- a/evil-collection-util.el
+++ /dev/null
@@ -1,49 +0,0 @@
-;;; evil-collection-util.el --- Base Evil Utilities -*- lexical-binding: t -*-
-
-;; Copyright (C) 2017 James Nguyen
-
-;; Author: James Nguyen <james@jojojames.com>
-;; Maintainer: James Nguyen <james@jojojames.com>
-;; Pierre Neidhardt <ambrevar@gmail.com>
-;; URL: https://github.com/jojojames/evil-collection
-;; Version: 0.0.1
-;; Package-Requires: ((emacs "25.1"))
-;; Keywords: evil, tools
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;; This package provides a set of utility functions to integrate with
-;; `evil-mode'.
-
-;;; Code:
-(require 'evil)
-
-(defmacro evil-collection-util-set-initial-state (mode state)
-  "Set the default STATE for MODE."
-  (let* ((mode-str (symbol-name mode))
-         (state-str (symbol-name state))
-         (defun-name (intern (format "evil-collection-%s-set-%s-default"
-                                     mode-str
-                                     state-str))))
-    `(progn
-       (defun ,defun-name (&rest _)
-         ,(format "Default `evil-state' of `%s' to '%s." mode-str state-str)
-         (if ,mode
-             (,(intern (format "evil-%s-state" state)))
-           (evil-normal-state)))
-       (advice-add #',mode :after #',defun-name))))
-
-(provide 'evil-collection-util)
-;;; evil-collection-util.el ends here
diff --git a/evil-collection-vlf.el b/evil-collection-vlf.el
index 636f23d..c51f8d6 100644
--- a/evil-collection-vlf.el
+++ b/evil-collection-vlf.el
@@ -27,7 +27,7 @@
 ;; Evil bindings for `vlf'.
 
 ;;; Code:
-(require 'evil-collection-util)
+(require 'evil)
 (require 'vlf nil t)
 
 (defvar vlf-mode-map)
diff --git a/evil-collection-xref.el b/evil-collection-xref.el
index 150c3fa..524bbf2 100644
--- a/evil-collection-xref.el
+++ b/evil-collection-xref.el
@@ -27,7 +27,7 @@
 ;; Evil bindings for `xref'.
 
 ;;; Code:
-(require 'evil-collection-util)
+(require 'evil)
 (require 'xref)
 
 (defun evil-collection-xref-setup ()