removed crap
better session handling