More csv cleanup