Cleanup
Cleanup & update submodules