For Eng-6718, remove dead code.