Removed some unused uses and assignments