remove unnecessary classes 2