diff --git a/core/core-auto-insert.el b/core/core-auto-insert.el
index ebf86fade..766cb44a7 100644
--- a/core/core-auto-insert.el
+++ b/core/core-auto-insert.el
@@ -1,7 +1,7 @@
 ;;; core-auto-insert.el --- file templates
 
 (use-package autoinsert
-  :after yasnippet
+  :defer t
   :init
   (setq auto-insert-query nil)    ; Don't prompt before insertion
   (setq auto-insert-alist '())
diff --git a/core/core-yasnippet.el b/core/core-yasnippet.el
index d14b2ed70..04ec438e6 100644
--- a/core/core-yasnippet.el
+++ b/core/core-yasnippet.el
@@ -33,6 +33,7 @@
       map))
   :config
   (after! helm (add-to-list 'yas-dont-activate 'helm-alive-p))
+  (require 'autoinsert)
 
   (yas-reload-all)
 
diff --git a/core/core.el b/core/core.el
index f6db2cb15..2c1c5c269 100644
--- a/core/core.el
+++ b/core/core.el
@@ -73,11 +73,9 @@
 (require 'core-defuns)
 (require 'diminish)
 
+(autoload 'use-package "use-package" "" nil 'macro)
 (eval-when-compile
-  (require 'dash)
-  (require 'use-package)
-  (require 'defuns-use-package)
-  (setq use-package-verbose narf-debug-mode)
+  (setq use-package-verbose nil)
 
   ;; Make any folders needed
   (dolist (file '("" "undo" "backup"))
diff --git a/core/lib/defuns-use-package.el b/core/lib/defuns-use-package.el
deleted file mode 100644
index 5fe0f71fe..000000000
--- a/core/lib/defuns-use-package.el
+++ /dev/null
@@ -1,27 +0,0 @@
-;;; defuns-use-package.el
-
-;; Meant to be loaded explicitly by core.el
-
-(defun use-package--add-keyword (keyword after)
- (setq use-package-keywords
-  (-insert-at (-find-index (lambda (key) (eq key after)) use-package-keywords)
-   keyword use-package-keywords)))
-
-(use-package--add-keyword :after :load-path)
-
-(defalias 'use-package-normalize/:after 'use-package-normalize-symlist)
-
-(defun use-package-handler/:after (name-symbol keyword arg rest state)
-  (let ((body (use-package-process-keywords name-symbol rest state)))
-    (if (null arg)
-        body
-      (use-package-concat
-       (use-package-process-keywords name-symbol
-         (use-package-sort-keywords (use-package-plist-maybe-put rest :defer t)) state)
-       (apply #'nconc
-              (mapcar (lambda (feature)
-                        `((after! ,feature (require ',name-symbol))))
-                      (delete-dups arg)))))))
-
-(provide 'defuns-use-package)
-;;; defuns-use-package.el ends here
diff --git a/modules/module-csharp.el b/modules/module-csharp.el
index 137f980ef..38566529a 100644
--- a/modules/module-csharp.el
+++ b/modules/module-csharp.el
@@ -9,7 +9,6 @@
 (use-package shader-mode :mode "\\.shader$")
 
 (use-package omnisharp
-  :after csharp-mode
   :preface
   (setq omnisharp-server-executable-path "~/Dropbox/lib/omnisharp-server/OmniSharp/bin/Debug/OmniSharp.exe"
         omnisharp-auto-complete-want-documentation nil)
diff --git a/modules/module-js.el b/modules/module-js.el
index 246e4e791..756600500 100644
--- a/modules/module-js.el
+++ b/modules/module-js.el
@@ -19,9 +19,9 @@
     (bind! :map js2-mode-map :m "gQ" 'web-beautify-js))
 
   (use-package js2-refactor
-    :after emr
     :init (add-hook! js2-mode 'emr-initialize)
     :config
+    (require 'emr)
     (mapc (lambda (x)
             (let ((command-name (car x))
                   (title (cadr x))
diff --git a/modules/module-regex.el b/modules/module-regex.el
index 354f23d34..88a92704a 100644
--- a/modules/module-regex.el
+++ b/modules/module-regex.el
@@ -1,15 +1,14 @@
 ;;; module-regex.el
 
-(use-package pcre2el
-  :functions (rxt--re-builder-switch-pcre-mode)
-  :after re-builder
-  :config
-  (setq reb-re-syntax 'pcre)
-  (bind! :map rxt-help-mode-map :n [escape] 'kill-buffer-and-window))
-
 (use-package re-builder
   :commands (re-builder reb-mode-buffer-p)
   :config
+  (use-package pcre2el
+    :functions (rxt--re-builder-switch-pcre-mode)
+    :config
+    (setq reb-re-syntax 'pcre)
+    (bind! :map rxt-help-mode-map :n [escape] 'kill-buffer-and-window))
+
   (add-hook! reb-mode 'narf|reb-cleanup)
   (evil-set-initial-state 'reb-mode 'insert)
   (bind! :map reb-mode-map
diff --git a/modules/module-ruby.el b/modules/module-ruby.el
index 8a52aaf45..f0c99a3c6 100644
--- a/modules/module-ruby.el
+++ b/modules/module-ruby.el
@@ -74,9 +74,9 @@
     (define-company-backend! ruby-mode (robe))))
 
 (use-package ruby-refactor
-  :after emr
   :init (add-hook! ruby-mode 'emr-initialize)
   :config
+  (require 'emr)
   (mapc (lambda (x)
           (let ((command-name (car x))
                 (title (cadr x))