Issue #15641: Clean up deprecated classes from importlib

Patch by Taras Lyapun.
5 files changed