Clean up unused uses
Merge pull request #678 from fejese/cleanup-uses

Clean up unused uses