Get rid of unwanted calls to get_payment_model