removing unused variables and imports

using pyflakes

Change-Id: I439d14657ad3f0c58f37161739879154b620c1ce
Merge "removing unused variables and imports"