*8787* Reorg and cleanup