final batch of cleaning and reorg