EDCM tidy-up.