diff --git a/.gitmodules b/.gitmodules
index 7430100..cb8ffca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "zsh-syntax-highlighting"]
 	path = zsh-syntax-highlighting
 	url = git://github.com/zsh-users/zsh-syntax-highlighting.git
-[submodule "autojump"]
-	path = autojump
-	url = git://github.com/joelthelion/autojump.git
 [submodule "dircolors-solarized"]
 	path = dircolors-solarized
 	url = git://github.com/seebi/dircolors-solarized.git
diff --git a/aliases.zsh b/aliases.zsh
index 5be7926..4ac17dc 100644
--- a/aliases.zsh
+++ b/aliases.zsh
@@ -14,7 +14,6 @@ alias pedit=" $EDITOR $ZSH_CONFIG/private.zsh; source $ZSH_CONFIG/private.zsh"
 alias grep='grep --color=auto'
 
 alias sign='gpg --detach-sign --armor'
-alias j=' j'
 
 ##### standard aliases (start with a space to be ignored in history)
 # default ls is untouched, except coloring
diff --git a/autojump b/autojump
deleted file mode 160000
index d692bc6..0000000
--- a/autojump
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d692bc644ac6c71dac05de7af720e649455cdeb5
diff --git a/functions.d/_j b/functions.d/_j
deleted file mode 100644
index e5e25ae..0000000
--- a/functions.d/_j
+++ /dev/null
@@ -1,23 +0,0 @@
-#compdef j
-
-#Copyright Joel Schaerer 2008, 2009
-#This file is part of autojump
-
-#autojump is free software: you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation, either version 3 of the License, or
-#(at your option) any later version.
-#
-#autojump is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
-#
-#You should have received a copy of the GNU General Public License
-#along with autojump.  If not, see <http://www.gnu.org/licenses/>.
-
-cur=${words[2, -1]}
-
-autojump --completion ${=cur[*]} | while read i; do 
-    compadd -U "$i"; 
-done
diff --git a/zshrc b/zshrc
index 63b156e..e23d69c 100644
--- a/zshrc
+++ b/zshrc
@@ -22,10 +22,6 @@ sources+="$ZSH_CONFIG/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
 # (sudo apt-get install command-not-found)
 sources+="/etc/zsh_command_not_found"
 
-# Autojump: a cd command that learns
-# Cloned From: git://github.com/joelthelion/autojump.git
-sources+="$ZSH_CONFIG/autojump/autojump.zsh"
-
 # Check for a system specific file
 systemFile=`uname -s | tr "[:upper:]" "[:lower:]"`
 sources+="$ZSH_CONFIG/$systemFile.zsh"