Issue #2060691: Remove dead code