Remove use of get_link_index_from_name where not needed