cleaned more classes.