Clean-up of demo application