Merge pull request #142 from apache/remove-dead-code

Remove dead code