Clean-up the call in  beginProjectWideValueChanges / endProjectWideValueChanges