Fixing killing of data and removing dead pids on repair.
Merge.