Remove some dead code
Merge pull request #231 from jory/fix-remove-some-dead-code

Remove some dead code