CON-561 | HubsV2 removal next step