consolidate duplicate Cell classes