Merge pull request #55 from kshchepanovskyi/master

[refactoring] Drop commented out code