diff --git a/init.el b/init.el
index 27efeba61..0628ae3ae 100644
--- a/init.el
+++ b/init.el
@@ -51,8 +51,6 @@
 	mod-git				; GIT tools/settings
 	mod-fly				; Syntax and spell checkers
     mod-emmet           ; Zen-coding for HTML+CSS
-	; mod-webdev		; Webdev tools (sass, js, etc)
-	; mod-gamedev		; Gamedev tools (C++, love2D, html5)
 	; mod-shell			; Terminal emulator settings
 
 	;; Must be last
diff --git a/modules/env-python-mode.el b/modules/env-python-mode.el
index ad2f8b3e3..daab2213e 100644
--- a/modules/env-python-mode.el
+++ b/modules/env-python-mode.el
@@ -3,9 +3,13 @@
 (if (not (file-directory-p "~/.emacs.d/.python-environments/default/"))
 	(jedi:install-server))
 
-(add-hook 'python-mode-hook 'jedi:setup)
+;; (setq jedi:complete-on-dot nil)
+
+(add-hook 'python-mode-hook 'jedi:ac-setup)
 (add-hook 'python-mode-hook
           (lambda ( )
+			  ;; (evil-define-key 'insert ac-mode-map (kbd "C-SPC") 'jedi:complete)
+
               ;; Don't remap backspace. Leave it to autopair, please.
               (define-key python-mode-map [backspace] nil)
               (evil-define-key 'normal python-mode-map (kbd "s-r")
diff --git a/modules/mod-ac.el b/modules/mod-ac.el
index 11ad6ca82..0293a4094 100644
--- a/modules/mod-ac.el
+++ b/modules/mod-ac.el
@@ -3,13 +3,14 @@
    auto-complete-config    ; its default config
    ))
 
-(setq ac-auto-show-menu nil     ; Suggestions box must be invoked manually (see core-keymaps.el)
-      ac-use-menu-map t         ; Enable ac-menu-map map when menu is open
-      ac-us-quick-help nil      ; Don't show tooltips unless invoked (see core-keymaps.el)
-      ac-fuzzy-cursor-color nil)
+;; (setq ac-auto-start 2)
+;; (setq ac-auto-show-menu nil     ; Suggestions box must be invoked manually (see core-keymaps.el)
+;;       ac-use-menu-map t         ; Enable ac-menu-map map when menu is open
+;;       ac-us-quick-help nil      ; Don't show tooltips unless invoked (see core-keymaps.el)
+;;       ac-fuzzy-cursor-color nil)
 
-;; Keep auto-complete quiet until it's needed (see core-keymaps.el)
-(setq ac-auto-start 2)
+;; Keep auto-complete quiet until it's needed
+(setq ac-auto-start nil)
 
 (ac-config-default)
 (ac-linum-workaround)         	; Fix line number flux bug