Cleanup replace part
Rebuild with new replacements