remove some redundant code calling iter_entry_points