diff --git a/Cask b/Cask
index f93e5c75e..cddaadd3d 100644
--- a/Cask
+++ b/Cask
@@ -172,7 +172,6 @@
 ;; Python -- modules/module-python.el
 (depends-on "anaconda-mode")
 (depends-on "nose")
-(depends-on "company-jedi")
 
 ;; Ruby -- modules/module-regex.el
 (depends-on "pcre2el")
diff --git a/modules/module-python.el b/modules/module-python.el
index b1052ef32..510ade6ef 100644
--- a/modules/module-python.el
+++ b/modules/module-python.el
@@ -14,13 +14,7 @@
   (define-env-command! python-mode "python --version | cut -d' ' -f2")
 
   ;; interferes with smartparens
-  (define-key python-mode-map (kbd "DEL") nil)
-
-  (after! company
-    (require 'company-jedi)
-    (unless (file-exists-p (concat python-environment-directory python-environment-default-root-name))
-      (jedi:install-server))
-    (define-company-backend! python-mode (jedi))))
+  (define-key python-mode-map (kbd "DEL") nil))
 
 (use-package nose
   :commands nose-mode
@@ -29,14 +23,13 @@
   (associate! nose-mode :pattern "/test_.+\\.py\\'")
   :config
   (bind! :map nose-mode-map
-         (:prefix ","
-           :n "tr" 'nosetests-again
-           :n "ta" 'nosetests-all
-           :n "ts" 'nosetests-one
-           :n "tv" 'nosetests-module
-           :n "tA" 'nosetests-pdb-all
-           :n "tO" 'nosetests-pdb-one
-           :n "tV" 'nosetests-pdb-module)))
+         :n ",tr" 'nosetests-again
+         :n ",ta" 'nosetests-all
+         :n ",ts" 'nosetests-one
+         :n ",tv" 'nosetests-module
+         :n ",tA" 'nosetests-pdb-all
+         :n ",tO" 'nosetests-pdb-one
+         :n ",tV" 'nosetests-pdb-module))
 
 (use-package anaconda-mode
   :diminish anaconda-mode
@@ -44,12 +37,15 @@
   :functions (anaconda-mode-running-p)
   :init
   (add-hook! python-mode '(anaconda-mode eldoc-mode))
+  (setq anaconda-mode-installation-directory (concat narf-temp-dir "anaconda/"))
   :config
   (bind! :map anaconda-mode-map     :m "gd"     'anaconda-mode-goto-definitions)
   (bind! :map anaconda-nav-mode-map :n [escape] 'anaconda-nav-quit)
 
   (advice-add 'anaconda-mode-doc-buffer :after 'narf*anaconda-mode-doc-buffer)
 
+  (require 'company-anaconda)
+  (define-company-backend! python-mode (anaconda))
   (after! emr
     (mapc (lambda (x)
             (let ((command-name (car x))
@@ -61,9 +57,11 @@
                                          (not (sp-point-in-string-or-comment)))))
               (emr-declare-command (intern (format "anaconda-mode-%s" (symbol-name command-name)))
                 :title title :modes 'python-mode :predicate predicate)))
-          '((view-doc          "view documentation" t)
-            (goto-assignments  "go to assignments"  t)
-            (usages            "show usages"        nil)))))
+          '((show-doc          "view documentation" t)
+            (find-assignments  "find assignments"  t)
+            (find-definitions  "find definitions"  t)
+            (find-file         "find assignments"  t)
+            (find-references   "show usages"  nil)))))
 
 (provide 'module-python)
 ;;; module-python.el ends here