Clean up imports to silence compiler warnings