Moved "removeDefaultNone" setting from schema to options