Cleaned up some schema classes.