Removed more unnecessary classes