more cleanup for pull request