util: cleanup zip specific utils.