Cleaned more classes.