session: improve close procedure