[#17] Remove unused class
Merge branch 'hotfix/17'

Close #17