bugid-98668 | Hubs v2 get promoted - code cleanup done