Cleanup warnings due to bad import