housecleaning / reorg