Removed unused use statements
Merge pull request #3141 from GrahamCampbell/use-fixes

[Fix] Use Fixes