Removed some unneeded submodules