cleaning up rebase