Removed unnecessary require
Removed unused modules and classes
Merge pull request #12187 from anupamc/master

Removed unnecessary require