remove some dead code
Merge pull request #181 from alexshadow007/remove_dead_code

Remove some dead code