Zebra_session were not used everywhere.