Remove db, improve csv