Further removal of references to restart