bugid-99410 | Hubs V2 old code clean