Refactoring: removed unused class