Cleanup to prepare to merge the burp1/burp2 backup phase control stuff.