Removed unnecessary InetAddress fiddling