#19490 first stage commit: code cleanup