diff --git a/.gitmodules b/.gitmodules
index 8bd930e..61a4100 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +1,9 @@
-[submodule "lib/ct-submit"]
-	path = lib/ct-submit
-	url = https://github.com/grahamedgecombe/ct-submit.git
+[submodule "lib/headers-more-nginx-module"]
+	path = lib/headers-more-nginx-module
+	url = https://github.com/openresty/headers-more-nginx-module.git
 [submodule "lib/naxsi"]
 	path = lib/naxsi
 	url = https://github.com/nbs-system/naxsi.git
-[submodule "lib/nginx-ct"]
-	path = lib/nginx-ct
-	url = https://github.com/grahamedgecombe/nginx-ct.git
 [submodule "lib/nginx-dav-ext-module"]
 	path = lib/nginx-dav-ext-module
 	url = https://github.com/arut/nginx-dav-ext-module.git
@@ -22,18 +19,6 @@
 [submodule "lib/ngx-fancyindex"]
 	path = lib/ngx-fancyindex
 	url = https://github.com/aperezdc/ngx-fancyindex.git
-[submodule "lib/redis2-nginx-module"]
-	path = lib/redis2-nginx-module
-	url = https://github.com/openresty/redis2-nginx-module.git
-[submodule "lib/_s/headers-more-nginx-module"]
-	path = lib/_s/headers-more-nginx-module
-	url = https://github.com/openresty/headers-more-nginx-module.git
-[submodule "lib/_s/ngx_cache_purge"]
-	path = lib/_s/ngx_cache_purge
-	url = https://github.com/FRiCKLE/ngx_cache_purge.git
-[submodule "lib/_s/set-misc-nginx-module"]
-	path = lib/_s/set-misc-nginx-module
-	url = https://github.com/openresty/set-misc-nginx-module.git
 [submodule "lib/openssl"]
 	path = lib/openssl
 	url = https://git.hakase.io/Hakase/openssl-custom.git
@@ -43,9 +28,3 @@
 [submodule "lib/zlib"]
 	path = lib/zlib
 	url = https://github.com/madler/zlib.git
-[submodule "lib/nginx-module-vts"]
-	path = lib/nginx-module-vts
-	url = https://github.com/vozlt/nginx-module-vts.git
-[submodule "lib/sass-nginx-module"]
-	path = lib/sass-nginx-module
-	url = https://github.com/mneudert/sass-nginx-module.git
diff --git a/auto.sh b/auto.sh
index b8d2c68..af15684 100755
--- a/auto.sh
+++ b/auto.sh
@@ -95,15 +95,11 @@ auto/configure \
 --add-module=./lib/ngx-fancyindex \
 --add-module=./lib/naxsi/naxsi_src \
 --add-module=./lib/nginx-dav-ext-module \
---add-module=./lib/_s/headers-more-nginx-module \
+--add-module=./lib/headers-more-nginx-module
 
 
 ### Deprecated (maybe) Modules
-#--add-module=./lib/sass-nginx-module \
-#--add-module=./lib/nginx-ct \
-#--add-module=./lib/_s/ngx_cache_purge \
-#--add-module=./lib/_s/set-misc-nginx-module
-#--add-module=./lib/nginx-module-vts \
+#--add-module=./lib/nginx-rtmp-module
 
 
 ### OpenSSL Skip
diff --git a/lib/_s/ngx_cache_purge b/lib/_s/ngx_cache_purge
deleted file mode 160000
index 331fe43..0000000
--- a/lib/_s/ngx_cache_purge
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 331fe43e8d9a3d1fa5e0c9fec7d3201d431a9177
diff --git a/lib/_s/set-misc-nginx-module b/lib/_s/set-misc-nginx-module
deleted file mode 160000
index f6639dc..0000000
--- a/lib/_s/set-misc-nginx-module
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f6639dc06c92ff301a845558f7b8a1ccef069997
diff --git a/lib/ct-submit b/lib/ct-submit
deleted file mode 160000
index 7bb2541..0000000
--- a/lib/ct-submit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7bb25419d9da590769c40c532b9457fabe6e003d
diff --git a/lib/_s/headers-more-nginx-module b/lib/headers-more-nginx-module
similarity index 100%
rename from lib/_s/headers-more-nginx-module
rename to lib/headers-more-nginx-module
diff --git a/lib/nginx-ct b/lib/nginx-ct
deleted file mode 160000
index 93e9884..0000000
--- a/lib/nginx-ct
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 93e9884764b77300236fd878ae284f2a40314f38
diff --git a/lib/nginx-module-vts b/lib/nginx-module-vts
deleted file mode 160000
index b606b13..0000000
--- a/lib/nginx-module-vts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b606b13006ffc3c694e8e6326a85f629c1288568
diff --git a/lib/redis2-nginx-module b/lib/redis2-nginx-module
deleted file mode 160000
index c989c82..0000000
--- a/lib/redis2-nginx-module
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c989c829a2877132cb100f901e320921250e068d
diff --git a/lib/sass-nginx-module b/lib/sass-nginx-module
deleted file mode 160000
index e06a7a3..0000000
--- a/lib/sass-nginx-module
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e06a7a3ca6e6d46e2b13d6cb75d6a0f48d98164f