More cleaning in MDS demo.