diff --git a/oni-core.el b/oni-core.el
index e1ef818..b404d5e 100644
--- a/oni-core.el
+++ b/oni-core.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2025.0130.155651
+;; Version: 2025.0211.211954
 ;; Package-Requires: (oni-data-dir oni-embrace oni-hydra expand-region multiple-cursors gcmh diminish ws-butler which-key insert-char-preview mixed-pitch ace-window vertico marginalia orderless consult embark docstr mini-frame)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -251,81 +251,6 @@ _s_: String list"
 
   (setq-default buffer-file-coding-system 'utf-8-unix))
 
-;; Set up autoloads for all of my configuration files so that when they get
-;; installed they get loaded automatically, but don’t require them to be
-;; installed.
-
-(with-eval-after-load 'ahk-mode (require 'oni-autohotkey))
-(with-eval-after-load 'alert (require 'oni-alert))
-(with-eval-after-load 'bat-mode (require 'oni-bat))
-(with-eval-after-load 'bats (require 'oni-bats))
-(with-eval-after-load 'bookmark (require 'oni-bookmark))
-(with-eval-after-load 'browse-url (require 'oni-browse-url))
-(with-eval-after-load 'cc-mode (require 'oni-c nil t))
-(with-eval-after-load 'cc-mode (require 'oni-cpp nil t))
-(with-eval-after-load 'cc-mode (require 'oni-java nil t))
-(with-eval-after-load 'cider (require 'oni-clojure))
-(with-eval-after-load 'circe (require 'oni-circe))
-(with-eval-after-load 'clojure-mode (require 'oni-clojure))
-(with-eval-after-load 'cmake-mode (require 'oni-cmake))
-(with-eval-after-load 'company (require 'oni-company))
-(with-eval-after-load 'compile (require 'oni-compilation))
-(with-eval-after-load 'conf-mode (require 'oni-conf))
-(with-eval-after-load 'counsel (require 'oni-counsel))
-(with-eval-after-load 'csharp-mode (require 'oni-csharp))
-(with-eval-after-load 'css-mode (require 'oni-css))
-(with-eval-after-load 'diff-hl (require 'oni-diff-hl))
-(with-eval-after-load 'dired (require 'oni-dired))
-(with-eval-after-load 'ediff (require 'oni-ediff))
-(with-eval-after-load 'elfeed (require 'oni-elfeed))
-(with-eval-after-load 'elisp-mode (require 'oni-elisp))
-(with-eval-after-load 'elm-mode (require 'oni-elm))
-(with-eval-after-load 'embrace (require 'oni-embrace))
-(with-eval-after-load 'emms (require 'oni-emms))
-(with-eval-after-load 'eshell (require 'oni-eshell))
-(with-eval-after-load 'fish-mode (require 'oni-fish))
-(with-eval-after-load 'flycheck (require 'oni-flycheck))
-(with-eval-after-load 'git-commit (require 'oni-git-commit))
-(with-eval-after-load 'gnus (require 'oni-gnus))
-(with-eval-after-load 'grep (require 'oni-grep))
-(with-eval-after-load 'groovy-mode (require 'oni-groovy))
-(with-eval-after-load 'haskell-mode (require 'oni-haskell))
-(with-eval-after-load 'highlight-indent-guides (require 'oni-highlight-indent-guides))
-(with-eval-after-load 'hydra (require 'oni-hydra))
-(with-eval-after-load 'ielm (require 'oni-elisp))
-;; (with-eval-after-load 'ivy (require 'oni-ivy))
-(with-eval-after-load 'jabber (require 'oni-jabber))
-(with-eval-after-load 'js2-mode (require 'oni-js))
-(with-eval-after-load 'json-mode (require 'oni-json))
-(with-eval-after-load 'lisp-mode (require 'oni-common-lisp))
-(with-eval-after-load 'log-edit (require 'oni-log-edit))
-(with-eval-after-load 'lsp (require 'oni-lsp))
-(with-eval-after-load 'lua-mode (require 'oni-lua))
-(with-eval-after-load 'lui (require 'oni-lui))
-(with-eval-after-load 'magit (require 'oni-magit))
-(with-eval-after-load 'make-mode (require 'oni-makefile))
-(with-eval-after-load 'notmuch (require 'oni-notmuch))
-(with-eval-after-load 'nov (require 'oni-epub))
-(with-eval-after-load 'org (require 'oni-org))
-(with-eval-after-load 'org-roam (require 'oni-org-roam))
-(with-eval-after-load 'package (require 'oni-package))
-(with-eval-after-load 'package-x (require 'oni-package))
-(with-eval-after-load 'paredit (require 'oni-paredit))
-(with-eval-after-load 'php-mode (require 'oni-php))
-(with-eval-after-load 'prescient (require 'oni-prescient))
-(with-eval-after-load 'projectile (require 'oni-projectile))
-(with-eval-after-load 'python (require 'oni-python))
-(with-eval-after-load 'ruby-mode (require 'oni-ruby))
-(with-eval-after-load 'rust-mode (require 'oni-rust))
-(with-eval-after-load 'scheme (require 'oni-scheme))
-(with-eval-after-load 'sgml-mode (require 'oni-html))
-(with-eval-after-load 'sh (require 'oni-sh))
-(with-eval-after-load 'shr (require 'oni-shr))
-(with-eval-after-load 'smartparens (require 'oni-smartparens))
-(with-eval-after-load 'sort (require 'oni-sort))
-(with-eval-after-load 'tramp (require 'oni-tramp))
-(with-eval-after-load 'web-mode (require 'oni-web))
-
 (with-eval-after-load 'yasnippet
   (require 'oni-yasnippet)
   (when (and (package-installed-p 'oni-yasnippet)