Cleanup

PaymentConfirmation cleaned