Remove use of http session in a couple more places