eliminating unnecessary classes