Delete some dead code.
Merge pull request #732 from square/jwilson_0419_deadcode

Delete some dead code.