Remove extraneous app_id from demos and otherwise clarify them
Update JSON examples and remove obsolete