Cleanup after rebuild