big refactoring - remove session parameters
Merge remote-tracking branch 'origin/master'