code clean-up, changes in session issuer