Removing unnecessary classes