Removed custom PaymentMethod class