Revert "Session cleanup"

This reverts commit 64218173a88d9dcf6c0a629ab1039a767c398926.
Cleanup