Remove not-required file class/subclasses
Merge pull request #16239 from akshay-vishnoi/remove-require

Remove not-required file class/subclasses