Clean up and prepare for supervisor consolidation.