Cleanup after rebase