issue #19735: Remove obsolete code