more submodule cleanup