Merge pull request #2454 from optout21/unused-use