big submodule cleanup