Code Cleanup for floating-ips