Finish demo app (again)