bugid-98668 | Hubs V2 get promoted code cleanup