case 3656 - Get rid of some variables storing in session.