Clean up logic when removing unused IPs.
Clean up logic when removing unused IPs.

anortef/calico,anortef/calico,fasaxc/felix,neiljerram/felix,kasisnu/calico,neiljerram/felix,ocadotechnology/calico,nbartos/calico,kasisnu/calico,alexaltair/calico,matthewdupre/felix,matthewdupre/felix,alexaltair/calico,beddari/calico,alexhersh/calico,neiljerram/felix,neiljerram/felix,fasaxc/felix,ocadotechnology/calico,Metaswitch/calico,beddari/calico,nbartos/calico,TrimBiggs/calico,alexhersh/calico,TrimBiggs/calico,Metaswitch/calico