Removed some unused uses.