Remove redundant classes