Remove some dead code
Merge pull request #369 from xzyfer/patch-1

Remove some dead code