I agree. We should also consider combing the database for payment_pending status and killing it off entirely (switch to disabled). I'll add a chore for that stuff.