Remove use of events within session manager