Cleanup of dead code.
Merge pull request #29 from murrekatt/develop

Cleanup of dead code.