cleaning up after rebase