Update Demo, clean up too.