Merge "Remove unused backup restore code"