KAZOO-2106: minor format tweaks and removed dead code