MDL-22151 backup - clean old data backup & restore code