Update demo.json to remove id parameters.
Some light refactoring