mdp4: Clean up duplicate functions.