Remove remaining csv logic