Remove redundant 1st-level only classes