working on decomplected sessions
Revert "use general sessions"

This reverts commit 329cab4c4551e873bbda7c2bec205c93cec97580.
reverted change, not yet ready for using the new frmework