Removed unused id variables