Remove unused and dead code.
Merge pull request #36 from ahmedcharles/dead

Remove unused and dead code.