cleanup before rebase