Remove "$that" from SessionManager