Remove some dead code.
Merge pull request #176 from ahmedcharles/dead

Remove some dead code.