Fix organization cleanup - archiving contacts and leaders