Clean up scripts so text data is stored in warehouse
Fix data generation
Fix remaining locations