Remove from option.c