cleanup to targeting system