Remove some variables that are never read locally