Cleaning up for the demo