Sure, when we remove the now deprecated scalar options.