additionnal cleanup on export