KAZOO-1212 removed commented code