Added session management
Revert "Added session management"

This reverts commit cc8ce30a13e7365eb77e2a2637db5502f4bfd6b4.