Remove Unused Code
Merge pull request #1731 from benjchristensen/issue-1525

Remove Unused Code