Remove old submodules.
Merge branch 'hotfix/oldmodules'