diff --git a/init/init-java.el b/init/init-java.el
index 28ad4090f..e719e6ea3 100644
--- a/init/init-java.el
+++ b/init/init-java.el
@@ -1,12 +1,11 @@
 (use-package eclim
   :commands (eclim-mode global-eclim-mode)
-  :init
+  :config
   (progn
     (setq eclim-eclipse-dirs '("/Applications/eclipse")
           eclim-executable "/Applications/eclipse/eclim")
-    (add-hook 'java-mode-hook 'eclim-mode))
-  :config
-  (progn
+    (add-hook 'java-mode-hook 'eclim-mode)
+
     ;; (use-package eclim-ant)
     ;; (use-package eclim-maven)
     (use-package eclim-problems)
diff --git a/init/init-python.el b/init/init-python.el
index eae0aa91d..a2798a548 100644
--- a/init/init-python.el
+++ b/init/init-python.el
@@ -60,10 +60,6 @@
                                        (not (use-region-p))
                                        (not (sp-point-in-string-or-comment))))))
 
-        (after "auto-complete"
-          (use-package ac-anaconda
-            :init (add-hook 'python-mode-hook 'ac-anaconda-setup)))
-
         (after "company"
           (use-package company-anaconda
             :config (company--backend-on 'python-mode-hook 'company-anaconda)))))
diff --git a/init/init-yasnippet.el b/init/init-yasnippet.el
index 36922adee..4a321f43d 100644
--- a/init/init-yasnippet.el
+++ b/init/init-yasnippet.el
@@ -1,22 +1,23 @@
 (use-package yasnippet
   :mode (("emacs\\.d/snippets/.+$" . snippet-mode))
   :init
-  (defvar yas-minor-mode-map
+  (progn
+    (defvar yas-minor-mode-map
       ;; Fix yasnippet keymaps so they only work in insert mode
       (let ((map (make-sparse-keymap)))
-      (bind 'insert map [(tab)] 'yas-expand)
-      (bind 'insert map (kbd "TAB") 'yas-expand)
-      (bind 'visual map (kbd "<backtab>") 'yas-insert-snippet)
-      map))
-  :config
-  (progn
+        (bind 'insert map [(tab)] 'yas-expand)
+        (bind 'insert map (kbd "TAB") 'yas-expand)
+        (bind 'visual map (kbd "<backtab>") 'yas-insert-snippet)
+        map))
+
     (add-hook 'snippet-mode-hook 'disable-final-newline)
     (add-hook 'snippet-mode-hook 'yas-minor-mode)
     (add-hook 'text-mode-hook 'yas-minor-mode)
     (add-hook 'prog-mode-hook 'yas-minor-mode)
     ;; (add-hook 'markdown-mode-hook 'yas-minor-mode)
-    (add-hook 'org-mode-hook 'yas-minor-mode)
-
+    (add-hook 'org-mode-hook 'yas-minor-mode))
+  :config
+  (progn
     (setq yas-verbosity 0)
     (setq yas-indent-line 'auto)
     (setq yas-also-auto-indent-first-line t)