Make safe for re-provisioning