Flakes

Fix unused imports, redefined methods,
and a comment not compliant with pep8

Change-Id: Ia1be0e7170b2b6519dfefed57f4bc39148d3e377
Merge "Flakes"