path and export cleanup