Pyflakes cleanup

Change-Id: Id5cf77ba8072388ce7850a8c68bd801ffe02e4f3