Removed the last vestiges of the non-unit classes