Removal of unnecessary classes.