better clean up of demo apps