Merge "msm: remove obsolete DMM code and config options"