Code (unused use) clean up
Merge pull request #5195