diff --git a/.gitmodules b/.gitmodules
index be177e3b..da379d8e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,24 +1,6 @@
-[submodule "third_party/jedi"]
-	path = third_party/ycmd/third_party/jedi
-	url = https://github.com/davidhalter/jedi
-[submodule "third_party/OmniSharpServer"]
-	path = third_party/ycmd/third_party/OmniSharpServer
-	url = https://github.com/nosami/OmniSharpServer
 [submodule "third_party/requests-futures"]
 	path = third_party/requests-futures
 	url = https://github.com/ross/requests-futures
 [submodule "third_party/requests"]
 	path = third_party/requests
 	url = https://github.com/kennethreitz/requests
-[submodule "third_party/waitress"]
-	path = third_party/ycmd/third_party/waitress
-	url = https://github.com/Pylons/waitress
-[submodule "third_party/bottle"]
-	path = third_party/ycmd/third_party/bottle
-	url = https://github.com/defnull/bottle
-[submodule "third_party/frozendict"]
-	path = third_party/ycmd/third_party/frozendict
-	url = https://github.com/slezica/python-frozendict
-[submodule "third_party/argparse"]
-	path = third_party/ycmd/third_party/argparse
-	url = https://github.com/bewest/argparse
diff --git a/third_party/ycmd/third_party/OmniSharpServer b/third_party/ycmd/third_party/OmniSharpServer
deleted file mode 160000
index c89ef98e..00000000
--- a/third_party/ycmd/third_party/OmniSharpServer
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c89ef98ed9182bbca40ce47f2e6ccd1cca91036d
diff --git a/third_party/ycmd/third_party/argparse b/third_party/ycmd/third_party/argparse
deleted file mode 160000
index af60aefb..00000000
--- a/third_party/ycmd/third_party/argparse
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit af60aefbbf43da32f75753f0c69f572ece654e9b
diff --git a/third_party/ycmd/third_party/bottle b/third_party/ycmd/third_party/bottle
deleted file mode 160000
index 154369b2..00000000
--- a/third_party/ycmd/third_party/bottle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 154369b2b9f7393ca9d3d73de7e046e2342cf00a
diff --git a/third_party/ycmd/third_party/frozendict b/third_party/ycmd/third_party/frozendict
deleted file mode 160000
index a9f23e0c..00000000
--- a/third_party/ycmd/third_party/frozendict
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a9f23e0c73819ef3433538c6bd820097a5b25e9b
diff --git a/third_party/ycmd/third_party/jedi b/third_party/ycmd/third_party/jedi
deleted file mode 160000
index 1d95a987..00000000
--- a/third_party/ycmd/third_party/jedi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1d95a987c4d4129cd1b47efa6a0f9efa2516ab64
diff --git a/third_party/ycmd/third_party/waitress b/third_party/ycmd/third_party/waitress
deleted file mode 160000
index c957f1d7..00000000
--- a/third_party/ycmd/third_party/waitress
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c957f1d70ab82ba15ce0dce8fca7cf70fe2f2b97