Updating submodule dependencies
Eliminating some unecessary modules from build