cleanup for the upstream pull request