session: cleanup part 1