Clean up imports

Signed-off-by: Oliver Metz <oliver@freetz.org>