Merge modules, fix typo
Remove useless code