diff --git a/.gitmodules b/.gitmodules
index 338e6ad..0a87eff 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -29,9 +29,6 @@
 	path = vim-files/.vim/bundle/taglist
 	url = https://github.com/vim-scripts/taglist.vim.git
 	ignore = untracked
-[submodule "zsh-files/oh-my-zsh"]
-	path = zsh-files/oh-my-zsh
-	url = https://github.com/robbyrussell/oh-my-zsh.git
 [submodule "vim-files/.vim/bundle/powerline"]
 	path = vim-files/.vim/bundle/powerline
 	url = https://github.com/Lokaltog/powerline.git
diff --git a/vim-files/vimrc b/vim-files/vimrc
index ea8faa5..ee80b3a 100644
--- a/vim-files/vimrc
+++ b/vim-files/vimrc
@@ -31,7 +31,6 @@ Bundle 'terryma/vim-multiple-cursors'
 Bundle 'myusuf3/numbers.vim'
 Bundle 'mhinz/vim-signify'
 Bundle 'nathanaelkane/vim-indent-guides'
-Bundle 'maxbrunsfeld/vim-yankstack'
 Bundle 'tpope/vim-surround'
 Bundle 'scrooloose/syntastic'
 Bundle 'Valloric/YouCompleteMe'
diff --git a/zsh-files/oh-my-zsh b/zsh-files/oh-my-zsh
deleted file mode 160000
index ab18795..0000000
--- a/zsh-files/oh-my-zsh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ab18795f3cd9bd45aec60a4a4bd8ecf820eb86c4