#19775 Cleanup