More underneeded var removal.