Have only one WD build
Remove not needed checks