delete some classes and refactoring