diff --git a/.gitmodules b/.gitmodules
index 89a9bad..ec7bff9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "pack/local/start/jsbeautify"]
-	path = pack/local/start/jsbeautify
-	url = https://github.com/vim-scripts/jsbeautify.git
 [submodule "pack/local/start/nginx.vim"]
 	path = pack/local/start/nginx.vim
 	url = https://github.com/chr4/nginx.vim.git
@@ -16,15 +13,6 @@
 [submodule "pack/local/start/The-NERD-Commenter"]
 	path = pack/local/start/The-NERD-Commenter
 	url = https://github.com/vim-scripts/The-NERD-Commenter.git
-[submodule "pack/local/start/tlib_vim"]
-	path = pack/local/start/tlib_vim
-	url = https://github.com/tomtom/tlib_vim.git
-[submodule "pack/local/start/vcscommand.vim"]
-	path = pack/local/start/vcscommand.vim
-	url = https://github.com/vim-scripts/vcscommand.vim.git
-[submodule "pack/local/start/vim-addon-mw-utils"]
-	path = pack/local/start/vim-addon-mw-utils
-	url = https://github.com/MarcWeber/vim-addon-mw-utils.git
 [submodule "pack/local/start/vim-airline"]
 	path = pack/local/start/vim-airline
 	url = https://github.com/bling/vim-airline.git
@@ -34,27 +22,9 @@
 [submodule "pack/local/opt/haproxy.vim"]
 	path = pack/local/opt/haproxy.vim
 	url = https://github.com/sclo/haproxy.vim.git
-[submodule "pack/local/opt/logstash.vim"]
-	path = pack/local/opt/logstash.vim
-	url = https://github.com/robbles/logstash.vim.git
 [submodule "pack/local/opt/open-terminal-filemanager"]
 	path = pack/local/opt/open-terminal-filemanager
 	url = https://github.com/vim-scripts/open-terminal-filemanager.git
-[submodule "pack/local/opt/salt-vim"]
-	path = pack/local/opt/salt-vim
-	url = https://github.com/saltstack/salt-vim.git
-[submodule "pack/local/opt/vim-pandoc"]
-	path = pack/local/opt/vim-pandoc
-	url = https://github.com/vim-pandoc/vim-pandoc.git
-[submodule "pack/local/opt/vim-pandoc-syntax"]
-	path = pack/local/opt/vim-pandoc-syntax
-	url = https://github.com/vim-pandoc/vim-pandoc-syntax.git
-[submodule "pack/local/opt/vim-snipmate"]
-	path = pack/local/opt/vim-snipmate
-	url = https://github.com/garbas/vim-snipmate.git
-[submodule "pack/local/opt/vim-snippets"]
-	path = pack/local/opt/vim-snippets
-	url = https://github.com/honza/vim-snippets.git
 [submodule "pack/local/start/textformat.vim"]
 	path = pack/local/start/textformat.vim
 	url = https://github.com/jozip/textformat.vim.git
@@ -64,9 +34,6 @@
 [submodule "pack/local/start/surround"]
 	path = pack/local/start/surround
 	url = https://tpope.io/vim/surround.git
-[submodule "pack/local/start/vim-fish"]
-	path = pack/local/start/vim-fish
-	url = https://github.com/dag/vim-fish.git
 [submodule "pack/local/start/nerdtree"]
 	path = pack/local/start/nerdtree
 	url = git@github.com:preservim/nerdtree.git
@@ -79,6 +46,6 @@
 [submodule "pack/local/start/vim-gitgutter"]
 	path = pack/local/start/vim-gitgutter
 	url = https://github.com/airblade/vim-gitgutter.git
-[submodule "pack/local/start/git-support"]
-	path = pack/local/start/git-support
-	url = git@github.com:WolfgangMehner/git-support.git
+[submodule "pack/local/start/vim-fugitive"]
+	path = pack/local/start/vim-fugitive
+	url = git@github.com:tpope/vim-fugitive.git
diff --git a/pack/local/start/git-support b/pack/local/start/git-support
deleted file mode 160000
index dc53934..0000000
--- a/pack/local/start/git-support
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit dc53934abfc23bf27f98921c8b46731c5ee8814b
diff --git a/pack/local/start/taglist-plus b/pack/local/start/taglist-plus
deleted file mode 160000
index 938379d..0000000
--- a/pack/local/start/taglist-plus
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 938379d5f2c3160027f1d402eeae14dc0d5a9068
diff --git a/pack/local/start/tlib_vim b/pack/local/start/tlib_vim
deleted file mode 160000
index a071b6d..0000000
--- a/pack/local/start/tlib_vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a071b6d41b20069a3520e0d101194a752968973b
diff --git a/pack/local/start/vcscommand.vim b/pack/local/start/vcscommand.vim
deleted file mode 160000
index 2fb3268..0000000
--- a/pack/local/start/vcscommand.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2fb32681361f37533455d20aaa7fc6eb11b0fa4b
diff --git a/pack/local/start/vim-addon-mw-utils b/pack/local/start/vim-addon-mw-utils
deleted file mode 160000
index 6aaf4fe..0000000
--- a/pack/local/start/vim-addon-mw-utils
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6aaf4fee472db7cbec6d2c8eea69fdf3a8f8a75d
diff --git a/pack/local/start/vim-fugitive b/pack/local/start/vim-fugitive
new file mode 160000
index 0000000..79e2bd3
--- /dev/null
+++ b/pack/local/start/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit 79e2bd381ad6e7f3d70ce4a8ec9f3f107b40f053