Remove unused import. Don't shaddow `peer()`.
Remove un-used import.
Merge pull request #10489 from s0undt3ch/develop

Lint fixes