Cleaning up uses
Merge pull request #871 from fejese/cleanup-uses

Cleaning up uses