Some cleanup to PayPal gateways