Cleaning up some disabled and unused code and added some data tables for the workshops and capture points rewrite.