Cleaned up imports

Signed-off-by: Patrick Wagstrom <patrick@wagstrom.net>