session: cleanup part 2