Import/export cleanup