Clean up of demo script and config