issue #19296: some cleanup