clean up routes
Merge branch 'csv-support'