Remove dups introduced by latest code changes.