Cleanup submodules #6