- removed unnecessary classes