Clean up imports, fix one type annotation