While here unset some variables even on vouchers side