More removal of submodules