Lots of cleanup in all classes.