more clean up from reorg