cleaning up PaymentController