Merge "Remove unused execution paths when formatting"