Got rid of some vestigial classes.