More code cleanup for os-floating-ips