Clean up imports

Signed-off-by: Jussi Virtanen <jussi.k.virtanen@gmail.com>
Merge pull request #3 from jvirtanen/cleanups/imports

Clean up imports