Clean up pull request #1