Merge "Remove useless thread checks"