Delete temp file when closing import popup
Delete temp file after unmarshalling
Code clean, change parameters order