getting rid of submodules for real this time?