Merge "Remove unused code that has a potential data race."