Clean up imports and warnings