Minor cleanup in session