Clean up the main demo some more.