CLDIDE-1781: make PaymentService do not return Response