cleanup for demos tab
Merging origin/jane/master-pending-demofix into master