removed session handling