#19632 Cleanup