Remove unnecessary submodules
Add missing, requires submodules and remove unused submodules