Removed unnecessary classes