removed session and error messages