remove more leftovers from class_options