Clean up the ModelBuilder a bit more to remove redundant classes.