[REF] Cleanup access to payment_processor_id