Removing call to ModuleHelper