Remove zip creation (which created a nonfunctional zip)
Don't put prefix and suffix in options map when they're null