Remove submodules.
Refactor part III