Remove unused imports and fix white-space lint issues.
Merge pull request #14959 from s0undt3ch/2014.7

Remove unused imports and fix white-space lint issues.