Removed some dead code
Merge pull request #8 from dalcde/remove-dead-code

Removed some dead code