Cleanup commit and organization