Remove some dead stores