move to standard session handling, remove legacy stuff