more cleaning up of submodules