Moved out function to get rid of OTPayment in OTPseudonym.
Include cleanups.