Cleanup of pull request #2 merge