remove reliance on session