MDL-22164 backup - more cleaning of old questions backup code