Removal of csv file usage, closes #8