Clean up demos
Demo cleanup