Remove unused imports
Merge pull request #5771 from spenczar/no_unused_imports

Remove unused imports