Code and commit cleanup