[PEP8] changes, remove obsolete imports, code improvements

Change-Id: I450e8ec7b81b4c353e9f4216ee6c5903089e8913
Merge "[PEP8] changes, remove obsolete imports, code improvements"