Cleanup after rebasing