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

Clean up unused uses