Remove unused code from PR #1475

TBR=@arv