DAR-306 | Hubs code cleanup