Clean up some imports.