Merge pull request #577 from apache/cleanup

Cleanup