more import/export cleanup