cleaned up last of submodules