Refactoring: removed obsolete class