refactoring - removed unused classes and tests