Clean up imports and other warnings