cleanup / reorg