mdss: cleanup merge