clean up some cust_payby upgrade issues, #23741