Added the csv-types vector and removed unused code.