remove unused class
refactoring