I think I would strip out all this unused stuff atm. We can add it back in the context of wormhole discovery service when we have a chance.