Removed meaningless code. No need to compare X == X.
Simplification of validating given server id with actual.
Moved voucher accounts to transactor.
Reordered public functions.
Removed commented out code.
Added missing include.
Removed unused typedefs.
Removed commented out code and unnecessary comments.