Batch and GUI export now clean (and the same)