CRM-13812 additional cleanup as we no longer need to cycle through deleted contacts separately