KAZOO-2077: ws removal