PEP8 fixes
Removed unnecessary import
Merge pull request #8937 from malinoff/config-fixes

Config fixes