Starting fresh with submodules
Cleanup