Fix problem with dynamical remove paymennt info and card info