Merge pull request #1001 from github/michaelrfairhurst/dead-code-3-un…

Merge pull request #1001 from github/michaelrfairhurst/dead-code-3-un… #3989