[Fixes #81965260] Cleanup code