from the AddonPaymentAccount change below it looks like this column should be dropped. Am I missing something?