Cleanup from git merge.