Clean up and separate addresses/arp promises