Issue 19844: Removed some junk code