#19758 Code cleanup prior to code review