Remove dead code
Merge pull request #3809 from cpennington/ok-dead-code

Remove dead code