Remove dead code and unused imports
Merge pull request #106 from bpollack/deadcode

Remove a lot of dead code and unused imports