[FOLD] Use IPAddress and strip port