Clean up the demo a bit.