Merge "Remove unnecessary links"