Remove two redundant classes