replace reorganization
Rip out rebuilding