Revert "Updated the session manager"

This reverts commit a233af2c638aa515b2ab2aa831a54779c981b2f9.