Remove references to session restore