Cleaning up and updating submodules