fn_cleanup_payment_info removes expiration dates.
This is not required by PCI provided you don't store full PAN.
We're automating follow on transactions and in some cases we need those data elements. I stored in a different location but it would be worth considering modifying fn_cleanup_payment_info to only remove info thats required per PCI guidelines.
https://www.pcisecuritystandards.org/documents/PCIDSS_QRGv3_2.pdf?agreement=true&time=1491313410938