Deleted more unwanted classes