Remove PROPS_OPTION