Remove unnecessary classes