moved remove_addresses