More cleanup in restore.
More cleanup.