Cleanup for pull request