CON-1121 | HubsV2 old styles cleanup