CON-561 | Hubs removal - removed code that was required for offshots