Merge "Remove unused clasess from zk.py" into feature/zuulv3