[FIX] orm: better removal of custom m2m fields