Merge "Remove some unused code around process state reporting."