Remove unused folders
Add extra commas to deal with CSV formatting issues