minor clean up on imports.