Use gulp-if for conditional piping
Remove gulp-util