bugid-98974 | S:MTb removed old modules
bugid-98974 | S:MTb removed old [fixed unit tests]
bugid-98974 | Hubs v2 removed old modules
bugid-98974 | Hubs v2 removed old modules [more code removed]