Cleanup for csv export part 2