At present, discovery is done by supplementing a transport provider with a discovery instance. Instead, remove all of this code, let the EJB client context do contextual discovery, and let the transport provider do contextual lookup of ServiceRegistry and register its services that way.