Remove some dead code.

Patch by Stephen Lin!