Revert "Basvi-Bug Fixes"

This reverts commit dda6d4814bed8f9b78b6ba6f37ea9460b3f96571.
Fix to CashPAyment Option XML Tag