Bug fixes in Zk integration and cleanup

Change-Id: I87b2407873617b9dd534b05323b8fb3adffa5b47