Cleaning up the building of IPs