Remove some dead code
Merge pull request #1732 from hypothesis/remove-some-dead-code

Remove some dead code