Adding network discovery util class.  Clean up of network util class.