Cleanup dead code
Merge pull request #28 from tribal-tec/master

Cleanup dead code