Cleaned up more classes.