Removing the CSV generation