diff --git a/custom/setup-autocompletion.el b/custom/setup-autocompletion.el
deleted file mode 100644
index fbfbaca..0000000
--- a/custom/setup-autocompletion.el
+++ /dev/null
@@ -1,8 +0,0 @@
-;; Add irony as flycheck hook
-(eval-after-load 'flycheck
-  '(add-hook 'flycheck-mode-hook 'flycheck-irony-setup))
-
-;; Set tab to autocomplete or indent depending on context
-(global-set-key (kbd "<tab>") 'company-indent-or-complete-common)
-
-(provide 'setup-autocompletion)
diff --git a/custom/setup-coding.el b/custom/setup-coding.el
deleted file mode 100644
index d915503..0000000
--- a/custom/setup-coding.el
+++ /dev/null
@@ -1,11 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;              Python                          ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(require 'py-autopep8)
-(elpy-enable)
-
-(setq elpy-modules (delq 'elpy-module-flycheck elpy-modules))
-(add-hook 'elpy-mode-hook 'flycheck-mode)
-(add-hook 'elpy-mode-hook 'py-autopep8-enable-on-save)
-
-(provide 'setup-coding)
diff --git a/custom/setup-org.el b/custom/setup-org.el
deleted file mode 100644
index 1a448e6..0000000
--- a/custom/setup-org.el
+++ /dev/null
@@ -1,28 +0,0 @@
-(require 'org)
-
-(define-key global-map "\C-cl" 'org-store-link)
-(define-key global-map "\C-ca" 'org-agenda)
-
-;; when ending TODO (C-C C-t) end with a note + timestamp
-(setq org-log-done 'note)
-;; Specify root dir to search for agenda files, TODOs, ...
-(setq org-agenda-files '("~/org"))
-;; Add extra states for keywords
-(setq org-todo-keywords
-      '((sequence "TODO" "IN-PROGRESS" "WAITING" "DONE")))
-
-(setq org-export-with-sub-superscripts nil)
-
-;; Preserve indentation in SRC blocks
-(setq org-src-preserve-indentation t)
-
-;; Specify which languages are allowed to run inside org-mode
-(org-babel-do-load-languages
- 'org-babel-load-languages '(
-                             (ditaa . t))
- )
-
-;; Tell org where to look for ditaa
-(setq org-ditaa-jar-path "/usr/share/java/ditaa/ditaa-0_10.jar")
-
-(provide 'setup-org)