Cleanup and reorg tasks.