zinc needs wipe and removal from service for later reuse

Change-Id: I3b4ffdf6eb929c9aa88d9b4b69cea5f8d96ac125