removed dependency on session storage