Clean up for pull request #22