Cleanup, preparing for rebase