Remove duplicate collect_valid_links methods