Rename Cleanup to CleanupForRestart.