Remove dead code
Merge pull request #84 from aplanas/master

Makes sense