KAZOO-505: formatting and remove some unused functions