pull request cleanup #4