diff --git a/oni-bats/oni-bats.el b/oni-bats/oni-bats.el
index 2c61d21..fb9e773 100644
--- a/oni-bats/oni-bats.el
+++ b/oni-bats/oni-bats.el
@@ -65,7 +65,5 @@
   (with-eval-after-load 'yasnippet
     (oni-bats-snippets-initialize)))
 
-;;;###autoload(with-eval-after-load 'bats-mode (require 'oni-bats))
-
 (provide 'oni-bats)
 ;;; oni-bats.el ends here
diff --git a/oni-flycheck.el b/oni-flycheck.el
index c97910f..653ff14 100644
--- a/oni-flycheck.el
+++ b/oni-flycheck.el
@@ -46,7 +46,5 @@
 (add-hook 'flycheck-mode-hook 'flycheck-cask-setup)
 (add-hook 'flycheck-mode-hook 'flycheck-posframe-mode)
 
-;;;###autoload(with-eval-after-load 'flycheck (require 'oni-flycheck))
-
 (provide 'oni-flycheck)
 ;;; oni-flycheck.el ends here
diff --git a/oni-lsp.el b/oni-lsp.el
index 1f74651..6afb8a5 100644
--- a/oni-lsp.el
+++ b/oni-lsp.el
@@ -55,7 +55,5 @@
 
 (add-hook 'lsp-mode-hook 'lsp-lens-mode)
 
-;;;###autoload(with-eval-after-load 'lsp-mode (require 'oni-lsp))
-
 (provide 'oni-lsp)
 ;;; oni-lsp.el ends here
diff --git a/oni-sh.el b/oni-sh.el
index 441c65b..54f5174 100644
--- a/oni-sh.el
+++ b/oni-sh.el
@@ -52,7 +52,5 @@
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("PKGBUILD\\'" . sh-mode))
 
-;;;###autoload(with-eval-after-load 'sh-script (require 'oni-sh))
-
 (provide 'oni-sh)
 ;;; oni-sh.el ends here
diff --git a/oni-smartparens.el b/oni-smartparens.el
index 08ce275..ed079e4 100644
--- a/oni-smartparens.el
+++ b/oni-smartparens.el
@@ -32,7 +32,5 @@
 (define-key smartparens-mode-map (kbd "C-<left>") 'sp-forward-barf-sexp)
 (define-key smartparens-mode-map (kbd "C-M-<right>") 'sp-backward-barf-sexp)
 
-;;;###autoload(with-eval-after-load 'smartparens (require 'oni-smartparens))
-
 (provide 'oni-smartparens)
 ;;; oni-smartparens.el ends here
diff --git a/oni-yasnippet.el b/oni-yasnippet.el
index 253e407..db50aaa 100644
--- a/oni-yasnippet.el
+++ b/oni-yasnippet.el
@@ -36,9 +36,5 @@
 (define-key yas-minor-mode-map (kbd "SPC") yas-maybe-expand)
 (define-key yas-minor-mode-map (kbd "TAB") nil)
 
-;;;###autoload(with-eval-after-load 'yasnippet (require 'oni-yasnippet))
-;;;###autoload
-(add-hook 'emacs-startup-hook 'yas-global-mode)
-
 (provide 'oni-yasnippet)
 ;;; oni-yasnippet.el ends here