Code clean up
Update zk, remove unused library