Yes, that's why I did the renaming.

Removing the unused items seems reasonable.  Do we want to take them out of both the SQL and the .CSV?