Removed uneeded Session2 stuff