bugid-98974 | S:MTb removed old modules