No dangerous default values. Double to single quotes.
Remove unused import
Merge pull request #10544 from s0undt3ch/hotfix/lint

Lint fixes