These classes got duplicated by collapse

Or were duplicated before collapse? Anyway,
removed the dupes.