remove obsolete imports and never used variables

(see pyflakes)

Change-Id: I75eebf77e7708601dcdb88a36158d2072e274e06
Merge "remove obsolete imports and never used variables"