A bit of burp1 phase4/restore cleanup.
Some long needed cleanup of burp1 phase4.