kazoo : remove dead code and unused var warnings