Remove references to session management