Removed unused use statements
Merge pull request #6815 from ibrasho/more-cleaning

[5.0] Removed Unused Imports