Remove some payment-related leftovers