Still more submodule cleanup