mdp: some minor cleanup