Remove unused import and variable declaration and add missing import

This is just some simple changes to make pyflakes happy (and fix git-p4
diffing).

Testing done: Unit tests pass.
Reviewed at https://reviews.reviewboard.org/r/4690/