Unused code removed
Merge pull request #114 from lyncodev/remove-unused-code

Unused code removed