Refactoring - remove unused classes