clean up of demo code