Get rid of unnecessary classes