Removed direct calls to session or local storage, instead calling UserSessionService