fix comment and remove session(optional)