Code removal of the internal session management part 2