Remove some problematic submodules