some cleanup to links