Simple mechanical cleanups

* Removed trailing and useless whitespaces
* Removed useless imports.

Signed-off-by: Christopher Glass <christopher.glass@canonical.com>