[Issue #84] Session clean ups
[Issue #84] Session clean ups