Need to explicitly define USE_SORTEDM2M after import cleanup