Removals of unnecessary classes