Remove dead code.
Merge pull request #2236 from dchen1107/cleanup

Remove dead code.