cleanup test/demo code