Remove obsolete restore context