diff --git a/init/custom.el b/init/custom.el
index b4094b20a..16f9802df 100644
--- a/init/custom.el
+++ b/init/custom.el
@@ -11,14 +11,10 @@
     ("3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "d61fc0e6409f0c2a22e97162d7d151dee9e192a90fa623f8d6a071dbf49229c6" default)))
  '(frame-brackground-mode (quote dark))
  '(global-auto-complete-mode t)
- '(ido-use-filename-at-point nil)
  '(magit-log-show-gpg-status t)
  '(ns-alternate-modifier (quote none))
  '(ns-command-modifier (quote control))
  '(ns-right-command-modifier (quote meta))
- '(package-selected-packages
-   (quote
-    (fish-mode string-inflection groovy-mode swift-mode toml-mode nginx-mode elixir-mode terraform-mode uuidgen uuid yaml-mode undo-tree switch-window smex smart-mode-line rust-mode rainbow-mode rainbow-delimiters puppet-mode projectile pkgbuild-mode password-store paredit multi-term multiple-cursors markdown-mode+ magit iy-go-to-char ido-ubiquitous idle-highlight-mode hi2 haskell-mode go-mode flycheck flx-ido erlang dockerfile-mode confluence cider browse-kill-ring ag ace-jump-mode)))
  '(require-final-newline (quote visit-save)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
diff --git a/init/settings.el b/init/settings.el
index cd77d6034..1024d8199 100644
--- a/init/settings.el
+++ b/init/settings.el
@@ -179,13 +179,7 @@
 ;; Display tabs as 4 spaces
 (setq default-tab-width 4)
 
-;; Set up Java home & path
-(setenv "JAVA_HOME" "/usr/lib/jvm/default")
-
 ;; Use CUPS
 (setq lpr-command "xpp")
 
-;; Allow same window in two frames
-(setq ido-default-buffer-method 'selected-window)
-
 (provide 'settings)