Removed unused uses.
Merge pull request #243 from xi-project/fabien-fixes-pt3

Removed unused uses.