diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 1102669..b57ac30 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -214,7 +214,6 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified"
 ;;             (propertize (concat "  " (char-to-string #xf233))
 ;;                         'face '(:family "Font Awesome" :height 0.75))))
 
-(with-eval-after-load 'cider (load "oni-cider-init"))
 (with-eval-after-load 'align (load "oni-align"))
 (with-eval-after-load 'cc-mode (load "oni-cpp-init"))
 (with-eval-after-load 'circe (load "oni-circe-init"))
@@ -267,21 +266,6 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified"
 
 (add-hook 'makefile-mode-hook 'electric-pair-local-mode)
 
-(with-eval-after-load 'clojure-mode
-  (require 'clojure-mode-extra-font-locking))
-
-(add-hook 'clojure-mode-hook 'paredit-mode)
-
-(add-hook 'clojure-mode-hook 'rainbow-delimiters-mode)
-
-(eval-when-compile (require 'inf-lisp))
-
-(defun oni:clojure-set-inferior-lisp ()
-  (setq inferior-lisp-program "lein repl"))
-
-(add-hook 'clojure-mode-hook 'oni-clojure-add-font-lock)
-(add-hook 'clojure-mode-hook 'oni-clojure-add-indent)
-
 (add-hook 'c-mode-hook 'electric-pair-local-mode)
 
 (add-hook 'c-mode-hook 'electric-indent-local-mode)
diff --git a/emacs/.emacs.d/init/oni-cider-init.el b/emacs/.emacs.d/init/oni-cider-init.el
deleted file mode 100644
index 3f37045..0000000
--- a/emacs/.emacs.d/init/oni-cider-init.el
+++ /dev/null
@@ -1,42 +0,0 @@
-;;; oni-cider-init.el --- Cider configuration        -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2018  Tom Willemse
-
-;; Author: Tom Willemse <tom@ryuslash.org>
-;; Keywords: local
-
-;; 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 <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; My Cider configuration.
-
-;;; Code:
-
-(require 'cider)
-
-(setq cider-repl-pop-to-buffer-on-connect t)
-
-(setq cider-show-error-buffer t
-      cider-auto-select-error-buffer t)
-
-(setq cider-repl-history-file
-      (concat user-emacs-directory "data/cider-history"))
-
-(setq cider-repl-wrap-history t)
-
-(add-hook 'cider-repl-mode-hook 'paredit-mode)
-
-(provide 'oni-cider-init)
-;;; oni-cider-init.el ends here
diff --git a/emacs/.emacs.d/site-lisp/oni-clojure.el b/emacs/.emacs.d/site-lisp/oni-clojure.el
deleted file mode 100644
index c739de5..0000000
--- a/emacs/.emacs.d/site-lisp/oni-clojure.el
+++ /dev/null
@@ -1,44 +0,0 @@
-;;; oni-clojure.el --- Extra commands and functions for clojure-mode  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2016  Tom Willemse
-
-;; Author: Tom Willemse <tom@ryuslash.org>
-;; Keywords:
-
-;; 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:
-
-;;
-
-;;; Code:
-
-(require 'clojure-mode)
-
-;;;###autoload
-(defun oni-clojure-add-font-lock ()
-  (font-lock-add-keywords
-   nil
-   '(("(\\(facts?\\)"
-      (1 font-lock-keyword-face))
-     ("(\\(background?\\)"
-      (1 font-lock-keyword-face)))))
-
-;;;###autoload
-(defun oni-clojure-add-indent ()
-  (define-clojure-indent (fact 1))
-  (define-clojure-indent (facts 1)))
-
-(provide 'oni-clojure)
-;;; oni-clojure.el ends here