KAZOO-543: clean up pull request