Removing the ISO demo, since we don't want that going into master.
Remove all my TODOs, after writing them down elsewhere.