consolidate redundant classes