Removing useless hubs requirement in Hub service