removed unnecessary classes