Remove class_name from options