#1241788 Remove dead code