reorg the cleaner ut