Merge pull request #323 from apache/fix/cleanup

Small cleanup