Removing hardcoded ips