KAZOO-2635: cleaning up schemas