CSVParser cleanup