cleanup based on pull request