Refactor demo script

And delete images at the end