Cleaning up the M2M field