Remove usage of SessionService