Remove unreachable code.
Merge pull request #901 from erictune/cleanup3

Remove unreachable code.