remove payload file
fix other rebase things