More cleanup of demos.