removing unnecessary classes