[5/25] Cleanup work near the box tombs.