demo-cleanup