Remove dead code.
Merge pull request #641 from Juniper/nsheth_dead_code

Remove dead code.