diff --git a/.gitmodules b/.gitmodules
index 37eb79c..6f90049 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,27 +1,24 @@
 [submodule "shell/zsh/oh-my-zsh"]
-  path = shell/zsh/oh-my-zsh
-  url = https://github.com/robbyrussell/oh-my-zsh.git
+	path = shell/zsh/oh-my-zsh
+	url = https://github.com/robbyrussell/oh-my-zsh.git
 [submodule "emacs.d"]
-  path = emacs.d
-  url = git@github.com:jimeh/.emacs.d.git
+	path = emacs.d
+	url = git@github.com:jimeh/.emacs.d.git
 [submodule "private"]
-  path = private
-  url = git@bitbucket.org:jimeh/dotfiles-private.git
+	path = private
+	url = git@bitbucket.org:jimeh/dotfiles-private.git
 [submodule "shell/tmux/tmuxifier"]
-  path = shell/tmux/tmuxifier
-  url = git@github.com:jimeh/tmuxifier.git
+	path = shell/tmux/tmuxifier
+	url = git@github.com:jimeh/tmuxifier.git
 [submodule "shell/zsh/zsh-syntax-highlighting"]
-  path = shell/zsh/zsh-syntax-highlighting
-  url = git://github.com/zsh-users/zsh-syntax-highlighting.git
-[submodule "shell/z"]
-  path = shell/z
-  url = git@github.com:jimeh/z.git
+	path = shell/zsh/zsh-syntax-highlighting
+	url = git://github.com/zsh-users/zsh-syntax-highlighting.git
 [submodule "shell/bash/git-aware-prompt"]
-  path = shell/bash/git-aware-prompt
-  url = git@github.com:jimeh/git-aware-prompt.git
+	path = shell/bash/git-aware-prompt
+	url = git@github.com:jimeh/git-aware-prompt.git
 [submodule "tmux/themes"]
-  path = tmux/themes
-  url = git@github.com:jimeh/tmux-themepack.git
+	path = tmux/themes
+	url = git@github.com:jimeh/tmux-themepack.git
 [submodule "shell/zsh/zsh-autosuggestions"]
 	path = shell/zsh/zsh-autosuggestions
 	url = git@github.com:tarruda/zsh-autosuggestions.git
diff --git a/shell/z b/shell/z
deleted file mode 160000
index 9ac0898..0000000
--- a/shell/z
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9ac0898e1b5a52327485afd840b5cf57740125bd
diff --git a/shell/z.sh b/shell/z.sh
deleted file mode 100644
index 34d2c35..0000000
--- a/shell/z.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Setup for z (https://github.com/rupa/z)
-#
-
-if [ -f "$DOTSHELL/z/z.sh" ]; then
-  _Z_NO_RESOLVE_SYMLINKS=1
-  source "$DOTSHELL/z/z.sh"
-fi