Removed unused variables

Removed unused variables according to pyflakes.

Change-Id: I25b808c58fa5a89a8641b168527320f6b575a974
Signed-off-by: Chuck Short <chuck.short@canonical.com>
Merge "Removed unused variables"