Merge "Remove checks for conditions that can't happen"