Getting rid of submodules