KAZOO-2703 more possible memory leaks
almost done