refactoring: remove old class