cleanup from cherry-pick backuptool