session: cleanup part 3