I20251024-0020
* Add cleanup to use module imports where possible - add new ModuleImportsCleanUpCore - add new CleanUpTest25 - fixes #2450
* Add cleanup to use module imports where possible - add new ModuleImportsCleanUpCore - add new CleanUpTest25 - fixes #2450