reorg, lots more deletion