Cleaning up submodules for now