demo-baseline-part-3: cleanup