cleanup around getting the IP address