Revert "Expand the location data"

This reverts commit fda4973471d089a5202d7eb8398a5723efc259f4.
Replace csvprintf with csvtotab.py