Adding cleanup to avoid data conflicts.