diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..c27cc5f8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+vim/bundle/*
+!vim/bundle/Vundle.vim
diff --git a/.gitmodules b/.gitmodules
index d3cda34f..eedd1ebb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,21 +1,3 @@
-[submodule "vim/bundle/YouCompleteMe"]
-	path = vim/bundle/YouCompleteMe
-	url = https://github.com/ycm-core/YouCompleteMe
-[submodule "vim/bundle/nerdtree"]
-	path = vim/bundle/nerdtree
-	url = https://github.com/preservim/nerdtree.git
-[submodule "vim/bundle/nerdtree-git-plugin"]
-	path = vim/bundle/nerdtree-git-plugin
-	url = https://github.com/Xuyuanp/nerdtree-git-plugin
-[submodule "vim/bundle/vim-airline"]
-	path = vim/bundle/vim-airline
-	url = https://github.com/vim-airline/vim-airline
-[submodule "vim/bundle/vim-airline-themes"]
-	path = vim/bundle/vim-airline-themes
-	url = https://github.com/vim-airline/vim-airline-themes
 [submodule "vim/bundle/Vundle.vim"]
 	path = vim/bundle/Vundle.vim
 	url = https://github.com/VundleVim/Vundle.vim
-[submodule "vim/bundle/vim-color-schemes"]
-	path = vim/bundle/vim-color-schemes
-	url = https://github.com/flazz/vim-colorschemes
diff --git a/vim/bundle/nerdtree b/vim/bundle/nerdtree
deleted file mode 160000
index 2c14ed0e..00000000
--- a/vim/bundle/nerdtree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2c14ed0e153cdcd0a1c7d1eabec6820bb6b3f8a2
diff --git a/vim/bundle/nerdtree-git-plugin b/vim/bundle/nerdtree-git-plugin
deleted file mode 160000
index ff9b14f1..00000000
--- a/vim/bundle/nerdtree-git-plugin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ff9b14f14dceecb6c08cb05053ad649c3b6ac250
diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline
deleted file mode 160000
index 0cfd829c..00000000
--- a/vim/bundle/vim-airline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0cfd829c92a6fd208bfdcbdd2881105462224636
diff --git a/vim/bundle/vim-airline-themes b/vim/bundle/vim-airline-themes
deleted file mode 160000
index 97cf3e6e..00000000
--- a/vim/bundle/vim-airline-themes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256
diff --git a/vim/bundle/vim-color-schemes b/vim/bundle/vim-color-schemes
deleted file mode 160000
index fd8f122c..00000000
--- a/vim/bundle/vim-color-schemes
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fd8f122cef604330c96a6a6e434682dbdfb878c9
diff --git a/vimrc b/vimrc
index 4235ba5f..d86f535e 100644
--- a/vimrc
+++ b/vimrc
@@ -6,18 +6,15 @@ call vundle#begin()
 Plugin 'VundleVim/Vundle.vim'
 
 "My Plugins"
-"Plugin 'ervandew/supertab'
-Plugin 'Valloric/YouCompleteMe'
+Plugin 'ervandew/supertab'
+"Plugin 'Valloric/YouCompleteMe'
 Plugin 'flazz/vim-colorschemes'
 Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
 "Plugin 'vim-scripts/auto-pairs-gentle'
-"Plugin 'luochen1990/rainbow'
 "Plugin 'Yggdroot/indentLine'
 Plugin 'scrooloose/nerdtree'
 Plugin 'Xuyuanp/nerdtree-git-plugin'
-"Plugin 'rakr/vim-one'
-Plugin 'maksimr/Lucius2'
 
 call vundle#end()            " required
 filetype plugin indent on    " required