Removed address and port in favor of socket. At least for the time being