refactoring some unuseful classes.