Remove unused import. White-space lint fix
No need to iterate through keys
Merge pull request #13629 from s0undt3ch/hotfix/lint

Lint Fixes