diff --git a/.gitmodules b/.gitmodules
index f4e5e8f..8e7bc95 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "oh-my-zsh"]
-	path = oh-my-zsh
-	url = https://github.com/robbyrussell/oh-my-zsh.git
 [submodule "vim/bundle/vundle"]
 	path = vim/bundle/vundle
 	url = https://github.com/gmarik/vundle.git
diff --git a/functions b/functions
index e4bd4dc..dfa7f54 100644
--- a/functions
+++ b/functions
@@ -5,7 +5,6 @@ function g {
     git status
   fi
 }
-compdef g=git
 
 insert-sudo() {
   zle beginning-of-line
diff --git a/oh-my-zsh b/oh-my-zsh
deleted file mode 160000
index 599831b..0000000
--- a/oh-my-zsh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 599831b85a5fd4564ab820530e2bb45f37ca3f99
diff --git a/zshrc b/zshrc
index 36547d7..4b2d5c2 100644
--- a/zshrc
+++ b/zshrc
@@ -1,9 +1,3 @@
-# home bin directory
-ZSH=$HOME/.oh-my-zsh
-# custom directory to load .oh-my-zsh files from
-ZSH_CUSTOM="$HOME/.zsh"
-ZSH_THEME="atomaka" # gnzh, candy, crunch, geoffgarside, macovsky
-
 PATH="$HOME/bin:$PATH"
 
 if [[ "$OSTYPE" == darwin* ]]; then
@@ -37,13 +31,6 @@ SAVEHIST=20000
 stty start undef
 stty stop undef
 
-# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
-# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git rbenv)
-
-source $ZSH/oh-my-zsh.sh
-
 # Aliases/Functions files
 source $HOME/.aliases
 source $HOME/.functions