csv-scope - lots of cleanup