Demo cleanup