MDL-22164 backup - finished cleaning of questions backup code