Get rid of submodules