CON-1548 | Removed unnecessary code after Hubs removal