minor changes, remove storing event source in session