And one last cleanup with submodules.