Cleanup of demos for dev kits