Cleaning up for demo1