delete and modified some classes