fix remaining demos

8 jobs for do_cleanup in 8 minutes and 42 seconds (queued for 1 second)