Clean up imports for #9.