session: fix cleanup in closing states