Remove unused code
Merge pull request #122 from sviridov/unused-code

Remove unused code