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

Cleaning up uses