Cleanup unused local variables

This patch cleans up a few unused local variables, found with pyflakes.

Change-Id: Id65acc5d47380c7d6bfbbfe075dc23e1de30813c