KAZOO-1104: clean up rebase