Remove ref to session management yet again