Remove dead code.
Merge pull request #3 from yyamano/upstream/deadcode

Remove dead code.