Cleanup and submodule update.