submodule mess cleanup