Adjustments on CSV generation and cleanup

Maybe we could group all this ci parameters, like we've done with config files