Remove some redundant classes