Cleanup dead code
Merge pull request #186 from mmun/cleanup

Cleanup dead code