Get rid of one_choice option type