clean up loading of demo data