cleanup submodules
more cleanup
cleanup