MDL-35156 remove references to non-existant options