updated last remaining references to card-id